[Pkg-sysvinit-commits] r918 - in sysvinit/trunk/debian: . initscripts/etc/init.d patches sysv-rc/etc/init.d

Petter Reinholdtsen pere at costa.debian.org
Tue Sep 12 21:42:04 UTC 2006 

Author: pere
Date: 2006-09-12 21:42:03 +0000 (Tue, 12 Sep 2006)
New Revision: 918

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd
   sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/halt
   sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
   sysvinit/trunk/debian/initscripts/etc/init.d/rc.local
   sysvinit/trunk/debian/initscripts/etc/init.d/reboot
   sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
   sysvinit/trunk/debian/initscripts/etc/init.d/skeleton
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/urandom
   sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Change default PATH in initscripts and init to prefer sbin/ over
    bin/, to avoid picking user visible replacement for system
    binaries.  This avoids shutdown problems on some
    machines. (Closes: #354163)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/changelog	2006-09-12 21:42:03 UTC (rev 918)
@@ -28,6 +28,10 @@
   * Add conditional dependency on glibc for hostname.sh and
     mountkernfs.sh, to allow the glibc warnings to show up without
     anything running in parallel.
+  * Change default PATH in initscripts and init to prefer sbin/ over
+    bin/, to avoid picking user visible replacement for system
+    binaries.  This avoids shutdown problems on some
+    machines. (Closes: #354163)
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 11 Sep 2006 00:44:44 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd	2006-09-12 21:42:03 UTC (rev 918)
@@ -10,7 +10,7 @@
 #                    which logs boot messages.
 ### END INIT INFO
 
-PATH=/sbin:/bin
+PATH=/sbin:/bin  # No remote fs at start
 DAEMON=/sbin/bootlogd
 [ -x "$DAEMON" ] || exit 0
 NAME=bootlogd
@@ -59,7 +59,7 @@
 	log_end_msg $ES
 	;;
   stop)
-	PATH=/sbin:/bin:/usr/sbin:/usr/bin
+	PATH=/bin:/sbin:/usr/bin:/usr/sbin
 	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon --stop --quiet --exec $DAEMON
 	ES=$?

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2006-09-12 21:42:03 UTC (rev 918)
@@ -9,7 +9,7 @@
 # Description:
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 [ "$DELAYLOGIN" ] || DELAYLOGIN=yes
 . /lib/init/vars.sh
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/halt
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/halt	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/halt	2006-09-12 21:42:03 UTC (rev 918)
@@ -11,7 +11,7 @@
 # Description:
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 [ -f /etc/default/halt ] && . /etc/default/halt
 
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/killprocs	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/killprocs	2006-09-12 21:42:03 UTC (rev 918)
@@ -8,7 +8,7 @@
 # Short-Description: executed by init(8) upon entering runlevel 1 (single).
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 . /lib/lsb/init-functions
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rc.local
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rc.local	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rc.local	2006-09-12 21:42:03 UTC (rev 918)
@@ -9,7 +9,7 @@
 ### END INIT INFO
 
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 . /lib/init/vars.sh
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/reboot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2006-09-12 21:42:03 UTC (rev 918)
@@ -10,7 +10,7 @@
 # Description:
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 . /lib/lsb/init-functions
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2006-09-12 21:42:03 UTC (rev 918)
@@ -9,7 +9,7 @@
 # Description: 
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 . /lib/lsb/init-functions
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/skeleton
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/skeleton	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/skeleton	2006-09-12 21:42:03 UTC (rev 918)
@@ -18,7 +18,7 @@
 # Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Description of the service"
 NAME=daemonexecutablename
 DAEMON=/usr/sbin/$NAME

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-09-12 21:42:03 UTC (rev 918)
@@ -9,7 +9,7 @@
 # Description:       See the bootlogd script
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=stop-bootlogd-single
 DAEMON=/sbin/bootlogd
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-09-12 21:42:03 UTC (rev 918)
@@ -9,7 +9,7 @@
 # Description:
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 . /lib/init/vars.sh
 
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-09-12 21:42:03 UTC (rev 918)
@@ -12,7 +12,7 @@
 #                    top level.
 ### END INIT INFO
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 KERNEL="$(uname -s)"
 RELEASE="$(uname -r)"
 . /lib/init/vars.sh

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2006-09-12 21:42:03 UTC (rev 918)
@@ -12,7 +12,7 @@
 
 [ -c /dev/urandom ] || exit 0
 
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 SAVEDFILE=/var/lib/urandom/random-seed
 POOLSIZE=512
 [ -f /proc/sys/kernel/random/poolsize ] && POOLSIZE="$(cat /proc/sys/kernel/random/poolsize)"

Modified: sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch	2006-09-12 21:42:03 UTC (rev 918)
@@ -40,7 +40,7 @@
  
  /* Default path inherited by every child. */
 -#define PATH_DFL   "PATH=/bin:/usr/bin:/sbin:/usr/sbin"
-+#define PATH_DEFAULT   "/usr/sbin:/usr/bin:/sbin:/bin"
++#define PATH_DEFAULT   "/sbin:/usr/sbin:/bin:/usr/bin"
  
  
  /* Prototypes. */

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-09-12 20:46:40 UTC (rev 917)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-09-12 21:42:03 UTC (rev 918)
@@ -13,7 +13,7 @@
 # 	Miquel van Smoorenburg <miquels at cistron.nl>
 # 	Bruce Perens <Bruce at Pixar.com>
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 
 # Un-comment the following for debugging.

More information about the Pkg-sysvinit-commits mailing list