[Pkg-sysvinit-commits] r1946 - in sysvinit/trunk/debian: . src/sysv-rc/etc/init.d

[Kel Modderman]

Author: kelmo-guest
Date: 2010-11-13 06:20:08 +0000 (Sat, 13 Nov 2010)
New Revision: 1946

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
Log:
Revert hunk of r1944 which modified trap signal.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-09-21 12:57:03 UTC (rev 1945)
+++ sysvinit/trunk/debian/changelog	2010-11-13 06:20:08 UTC (rev 1946)
@@ -3,10 +3,6 @@
   * Remove runlevel duration printing code from init.d/rc script
     as it was scheduled for removal before squeeze and imperfect.
     (Closes: #584862)
-  * Really ignore CTRL-C interuption in initd.d/rc by setting a
-    signal trap with null string as argument. This prevents incomplete
-    boot if CTRL-C is pressed, eg. during fsck, when conccurrent boot is
-    enabled. (Closes: #595431)
   * Prevent init.d/rc script from executing stop scripts twice
     in runlevels 0 and 6 when conccurrent boot is enabled.
     (Closes: #594253)
@@ -19,7 +15,7 @@
     /sys/* as there is no good reason to do so. Thanks Michael Biebl
     for the patch. (Closes: #597338)
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 21 Sep 2010 22:54:56 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sat, 13 Nov 2010 16:17:52 +1000
 
 sysvinit (2.88dsf-12) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-09-21 12:57:03 UTC (rev 1945)
+++ sysvinit/trunk/debian/src/sysv-rc/etc/init.d/rc	2010-11-13 06:20:08 UTC (rev 1946)
@@ -41,7 +41,7 @@
 trap on_exit EXIT # Enable emergency handler
 
 # Ignore CTRL-C only in this shell, so we can interrupt subprocesses.
-trap "" INT QUIT TSTP
+trap ":" INT QUIT TSTP
 
 # Set onlcr to avoid staircase effect.
 stty onlcr 0>&1