[Pkg-sysvinit-commits] r1730 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-06 18:24:03 +0000 (Sun, 06 Sep 2009)
New Revision: 1730

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts.postinst
Log:
Make sure the calls to 'update-rc.d X remove' in initscripts postinst
do not ignore errors (Closes: #406361).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-06 17:26:30 UTC (rev 1729)
+++ sysvinit/trunk/debian/changelog	2009-09-06 18:24:03 UTC (rev 1730)
@@ -4,6 +4,8 @@
     failing to migrate.
   * Make initscripts depend on sysvinit-utils (>= 2.86.ds1-64), to make
     sure the fstab-decode program is available (Closes: #545356).
+  * Make sure the calls to 'update-rc.d X remove' in initscripts postinst
+    do not ignore errors (Closes: #406361).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 06 Sep 2009 17:13:33 +0200
 

Modified: sysvinit/trunk/debian/initscripts.postinst
===================================================================
--- sysvinit/trunk/debian/initscripts.postinst	2009-09-06 17:26:30 UTC (rev 1729)
+++ sysvinit/trunk/debian/initscripts.postinst	2009-09-06 18:24:03 UTC (rev 1730)
@@ -37,21 +37,21 @@
 #
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-7"
 then
-	update-rc.d -f single remove >/dev/null 2>&1 || :
+	update-rc.d -f single remove >/dev/null
 fi
 
 # In 2.86.ds1-16, the mtab.sh and hostname.sh scripts were moved.
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-16"
 then
-	update-rc.d -f mtab.sh remove >/dev/null 2>&1 || :
-	update-rc.d -f hostname.sh remove >/dev/null 2>&1 || :
+	update-rc.d -f mtab.sh remove >/dev/null
+	update-rc.d -f hostname.sh remove >/dev/null
 fi
 
 # In 2.86.ds1-21, the sendsigs script were moved, and in 2.86.ds1-35
 # it was moved back.
 if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-35"
 then
-	update-rc.d -f sendsigs remove >/dev/null 2>&1 || :
+	update-rc.d -f sendsigs remove >/dev/null
 fi
 
 #
@@ -60,7 +60,7 @@
 # We have to remove the old links _before_ we install new ones.
 #
 if dpkg --compare-versions "$PREV_VER" lt "2.87dsf-2" ; then
-	update-rc.d -f mountoverflowtmp remove >/dev/null 2>&1 || :
+	update-rc.d -f mountoverflowtmp remove >/dev/null
 fi
 
 #
@@ -114,7 +114,7 @@
 for F in mountkernfs devpts.sh mountvirtfs
 do
 	rm -f /etc/init.d/$F
-	update-rc.d $F remove >/dev/null 2>&1 || :
+	update-rc.d $F remove >/dev/null
 done
 
 #