Package: initscripts
Version: 2.88dsf-51
Followup-For: Bug #735521
The attached patch drops /etc/init.d/motd.
This patch needs to wait until the upload of login 1:4.1.5.1-2 closing
bug 741129.
- Josh Triplett
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages initscripts depends on:
ii coreutils 8.21-1
ii debianutils 4.4
ii libc6 2.18-4
ii lsb-base 4.1+Debian12
ii mount 2.20.1-5.6
ii sysv-rc 2.88dsf-51
ii sysvinit-utils 2.88dsf-51
Versions of packages initscripts recommends:
ii e2fsprogs 1.42.9-3
ii psmisc 22.21-1
initscripts suggests no packages.
-- Configuration Files:
/etc/default/tmpfs changed [not included]
-- no debconf information
>From 855dd67002bcdb602480bc37b3f8429c43ea4a9a Mon Sep 17 00:00:00 2001
From: Josh Triplett <j...@joshtriplett.org>
Date: Sat, 8 Mar 2014 14:40:05 -0800
Subject: [PATCH] Drop /etc/init.d/motd
login now handles the dynamic motd itself via pam_exec, and no longer
needs /run/motd.dynamic. Add Breaks on older versions of login.
(Closes: #735521)
---
debian/changelog | 5 ++++
debian/control | 4 ++-
debian/initscripts.conffiles | 1 -
debian/initscripts.lintian-overrides | 1 -
debian/initscripts.maintscript | 1 +
debian/initscripts.postinst | 3 --
debian/initscripts.postrm | 7 +++--
debian/initscripts.preinst | 4 +++
debian/src/initscripts/etc/init.d/motd | 53 ----------------------------------
9 files changed, 18 insertions(+), 61 deletions(-)
delete mode 100644 debian/src/initscripts/etc/init.d/motd
diff --git a/debian/changelog b/debian/changelog
index 6f4f69c..d640d98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,11 @@ sysvinit (2.88dsf-52) UNRELEASED; urgency=low
* In sendsigs, skip killing any root user process which name starts with
'@' character. (Closes: #738855)
+ [ Josh Triplett ]
+ * Drop /etc/init.d/motd; login now handles the dynamic motd itself via
+ pam_exec, and no longer needs /run/motd.dynamic. Add Breaks on older
+ versions of login. (Closes: #735521)
+
-- Petter Reinholdtsen <p...@debian.org> Thu, 13 Feb 2014 13:23:35 +0100
sysvinit (2.88dsf-51) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1705da9..8ab859f 100644
--- a/debian/control
+++ b/debian/control
@@ -134,7 +134,9 @@ Breaks:
# Needed for transition to dependency-based boot for wheezy
bootchart (<< 0.10~svn407-4),
# Older versions of hurd do not implement the neccessary functionality
- hurd (<< 0.5.git20131101~)
+ hurd (<< 0.5.git20131101~),
+# Older versions of login expect /run/motd.dynamic
+ login (<< 1:4.1.5.1-2)
Description: scripts for initializing and shutting down the system
The scripts in this package initialize a standard Debian
system at boot time and shut it down at halt or reboot time.
diff --git a/debian/initscripts.conffiles b/debian/initscripts.conffiles
index db7db27..dfb9495 100644
--- a/debian/initscripts.conffiles
+++ b/debian/initscripts.conffiles
@@ -6,7 +6,6 @@
/etc/init.d/halt
/etc/init.d/hostname.sh
/etc/init.d/killprocs
-/etc/init.d/motd
/etc/init.d/mountall.sh
/etc/init.d/mountall-bootclean.sh
/etc/init.d/mountnfs.sh
diff --git a/debian/initscripts.lintian-overrides b/debian/initscripts.lintian-overrides
index 6b27b21..0908f8f 100644
--- a/debian/initscripts.lintian-overrides
+++ b/debian/initscripts.lintian-overrides
@@ -10,7 +10,6 @@ initscripts: init.d-script-missing-dependency-on-remote_fs etc/init.d/bootlogs:
initscripts: init.d-script-missing-dependency-on-remote_fs etc/init.d/killprocs: required-start
initscripts: init.d-script-possible-missing-stop etc/init.d/urandom 1
initscripts: init.d-script-missing-dependency-on-remote_fs etc/init.d/checkfs.sh: required-start
-initscripts: init.d-script-missing-dependency-on-remote_fs etc/init.d/motd: required-start
initscripts: init.d-script-possible-missing-stop etc/init.d/umountnfs.sh 1
initscripts: init.d-script-missing-dependency-on-remote_fs etc/init.d/umountnfs.sh: required-stop
initscripts: init.d-script-missing-dependency-on-remote_fs etc/init.d/reboot: required-stop
diff --git a/debian/initscripts.maintscript b/debian/initscripts.maintscript
index 54b8c35..4e450d0 100644
--- a/debian/initscripts.maintscript
+++ b/debian/initscripts.maintscript
@@ -1,3 +1,4 @@
rm_conffile /etc/init.d/bootlogd 2.88dsf-42 initscripts
rm_conffile /etc/init.d/stop-bootlogd-single 2.88dsf-42 initscripts
rm_conffile /etc/init.d/stop-bootlogd 2.88dsf-42 initscripts
+rm_conffile /etc/init.d/motd 2.88dsf-52 initscripts
diff --git a/debian/initscripts.postinst b/debian/initscripts.postinst
index 7288c2c..cc860da 100755
--- a/debian/initscripts.postinst
+++ b/debian/initscripts.postinst
@@ -149,9 +149,6 @@ fi
if [ -x /etc/init.d/single ]; then
update-rc.d single defaults >/dev/null || exit $?
fi
-if [ -x /etc/init.d/motd ]; then
-update-rc.d motd defaults >/dev/null || exit $?
-fi
if [ -x /etc/init.d/bootlogs ]; then
update-rc.d bootlogs defaults >/dev/null || exit $?
fi
diff --git a/debian/initscripts.postrm b/debian/initscripts.postrm
index 5debca4..aee4dc0 100755
--- a/debian/initscripts.postrm
+++ b/debian/initscripts.postrm
@@ -16,6 +16,8 @@ case "$1" in
rm -f /etc/init.d/bootclean.sh.dpkg-old
rm -f /etc/default/bootlogd
rm -f /etc/default/bootlogd.dpkg-old
+ rm -f /etc/init.d/motd
+ rm -f /etc/init.d/motd.dpkg-old
#
# Remove configuration files
@@ -33,7 +35,9 @@ case "$1" in
#
# Remove run time state files
#
- rm -f /var/run/motd
+ rm -f \
+ /var/run/motd \
+ /var/run/motd.dynamic
#
# Remove log files
@@ -48,7 +52,6 @@ case "$1" in
# inserted
update-rc.d rmnologin remove >/dev/null || exit $?
update-rc.d rc.local remove >/dev/null || exit $?
- update-rc.d motd remove >/dev/null || exit $?
update-rc.d bootlogs remove >/dev/null || exit $?
update-rc.d single remove >/dev/null || exit $?
update-rc.d killprocs remove >/dev/null || exit $?
diff --git a/debian/initscripts.preinst b/debian/initscripts.preinst
index 6c11ca1..443ab46 100755
--- a/debian/initscripts.preinst
+++ b/debian/initscripts.preinst
@@ -37,6 +37,10 @@ case "$1" in
eliminate_conffile "/etc/init.d/mtab.sh"
fi
+ if [ "$2" ] && dpkg --compare-versions "$2" lt "2.88dsf-52" ; then
+ eliminate_conffile "/etc/init.d/motd"
+ fi
+
#
# Move conflicting log _file_ if present
#
diff --git a/debian/src/initscripts/etc/init.d/motd b/debian/src/initscripts/etc/init.d/motd
deleted file mode 100644
index e0d7706..0000000
--- a/debian/src/initscripts/etc/init.d/motd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: motd
-# Required-Start: hostname $local_fs
-# Required-Stop:
-# Should-Start:
-# Default-Start: 1 2 3 4 5
-# Default-Stop:
-# Short-Description: Create dynamic part of /etc/motd
-# Description: /etc/motd is user-editable and static. This script
-# creates the initial dynamic part, by default the
-# output of uname, and stores it in /var/run/motd.dynamic.
-# Both parts are output by pam_motd.
-### END INIT INFO
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-. /lib/init/vars.sh
-
-do_start () {
- # Update motd
- uname -snrvm > /var/run/motd.dynamic
-}
-
-do_status () {
- if [ -f /var/run/motd.dynamic ] ; then
- return 0
- else
- return 4
- fi
-}
-
-case "$1" in
- start|"")
- do_start
- ;;
- restart|reload|force-reload)
- echo "Error: argument '$1' not supported" >&2
- exit 3
- ;;
- stop)
- # No-op
- ;;
- status)
- do_status
- exit $?
- ;;
- *)
- echo "Usage: motd [start|stop|status]" >&2
- exit 3
- ;;
-esac
-
-:
--
1.9.0
