From d2c97bee851ad783be62df8498ae01efa310a8aa Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 6 Apr 2009 11:35:02 +0200 Subject: [PATCH] postrm: when removing the package use /etc/init.d/rc instead of grml files --- debian/changelog | 12 ++++++++++-- debian/postrm | 21 +++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1761bea..86b1f3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,16 @@ grml-etc (1.1.13) unstable; urgency=low IPython.Extensions.InterpreterExec module by default anymore. Upstream does not ship this configuration snippet as well. Thanks for reporting and debugging, wuehlmaus! [Closes: issue618] - - -- Michael Prokop Thu, 12 Feb 2009 18:24:11 +0100 + * /etc/skel/.Xresources: improve xterm/ uxterm font setup. + This should fix our longstanding unicode problem. Thanks to + Thorsten Glaser for help. [Closes: issue468] + Additionally add configuration for urxvt. + * /etc/skel/.Xmodmap: Use 'EuroSign' instead of 'currency'. + * Debian postrm: when removing the package use /etc/init.d/rc instead + of /etc/init.d/grml-[reboot|halt]. + * Slightly improve message for removing media from tray on reboot/halt. + + -- Michael Prokop Mon, 06 Apr 2009 11:32:27 +0200 grml-etc (1.1.12) unstable; urgency=low diff --git a/debian/postrm b/debian/postrm index 589d0b3..d7e7eb8 100755 --- a/debian/postrm +++ b/debian/postrm @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Sep 15 15:39:48 CEST 2006 [mika] ################################################################################ set -e @@ -22,6 +21,16 @@ undivert_gen() { --divert $2/$1.$DEXT $2/$1 #> /dev/null } +replace_grml_with_orig_inittab() { + if grep -q '^l0:0:wait:/etc/init.d/grml-halt$' /etc/inittab ; then + sed -i 's|^l0:0:wait:/etc/init.d/grml-halt|l0:0:wait:/etc/init.d/rc 0|' /etc/inittab + fi + + if grep -q '^l6:6:wait:/etc/init.d/grml-reboot$' /etc/inittab ; then + sed -i 's|^l6:6:wait:/etc/init.d/grml-reboot|l6:6:wait:/etc/init.d/rc 6|' /etc/inittab + fi +} + case "$1" in purge) for cmd in $TO_UNDIVERT1; do @@ -42,9 +51,17 @@ case "$1" in for cmd in $TO_UNDIVERT6; do undivert_gen $cmd /etc/X11/windowlab done + + replace_grml_with_orig_inittab ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + remove|abort-install|disappear) + replace_grml_with_orig_inittab + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade) ;; + *) echo "postrm called with unknown argument $1" >&2 exit 1 -- 2.1.4