diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/rsyslog.init | 10 | ||||
| -rw-r--r-- | debian/rsyslog.postinst | 9 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 25 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index ad6609c..325805e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,14 @@ rsyslog (3.20.2-1) UNRELEASED; urgency=low - Add --enable-gnutls to configure flags. * debian/control - Add ${misc:Depends} to rsyslog-doc. + * Let rsyslog collect messages as long as possible during shutdown or + reboot. As /usr may be mounted via NFS, the latest possible point is just + before umountnfs. Closes: #474498 + - Update the stop priorities for runlevel 0 and 6 from K90 to S30 for + sysv-rc and migrate existing symlinks. + - Update LSB header to stop after sendsigs and before umountnfs. + - Use the sendsigs process omission interface to avoid being killed by + killall5. -- Michael Biebl <biebl@debian.org> Fri, 16 Jan 2009 00:30:38 +0100 diff --git a/debian/rsyslog.init b/debian/rsyslog.init index fb4dfab..c3b6267 100644 --- a/debian/rsyslog.init +++ b/debian/rsyslog.init @@ -2,9 +2,8 @@ ### BEGIN INIT INFO # Provides: rsyslog # Required-Start: $remote_fs $time -# Required-Stop: $remote_fs $time -# Should-Start: $network -# Should-Stop: $network +# Required-Stop: umountnfs $time +# X-Stop-After: sendsigs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: enhanced syslogd @@ -51,6 +50,11 @@ do_start() # 1 if daemon was already running # other if daemon could not be started or a failure occured start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS + + OMITDIR=/lib/init/rw/sendsigs.omit.d + mkdir -p $OMITDIR + rm -f $OMITDIR/rsyslog + ln -s $PIDFILE $OMITDIR/rsyslog } do_stop() diff --git a/debian/rsyslog.postinst b/debian/rsyslog.postinst index ed856d9..6f8b8a2 100644 --- a/debian/rsyslog.postinst +++ b/debian/rsyslog.postinst @@ -58,6 +58,15 @@ case "$1" in rotate_old_log_files fi + # Update init script priorities + if dpkg --compare-versions "$2" lt "3.20.2-1"; then + for i in 0 6 ; do + if [ -e /etc/rc$i.d/K90rsyslog ]; then + mv /etc/rc$i.d/K90rsyslog /etc/rc$i.d/S30rsyslog + fi + done + fi + # Stop the service on upgrades before it is started again. # dh_installinit -r will create the start code. if [ -n "$2" ]; then diff --git a/debian/rules b/debian/rules index 33b355c..8c48176 100755 --- a/debian/rules +++ b/debian/rules @@ -110,7 +110,7 @@ binary-arch: build install dh_installexamples dh_install dh_installlogrotate - dh_installinit -r -- start 10 2 3 4 5 . stop 90 0 1 6 . + dh_installinit -r -- start 10 2 3 4 5 . start 30 0 6 . stop 90 1 . dh_installman dh_installdebconf dh_link |