[Pkg-sysvinit-commits] r462 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-30 10:27:01 +0000 (Fri, 30 Dec 2005)
New Revision: 462

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/etc/init.d/urandom
Log:
In urandom initscript, add PATH -- closes #345273; also condense variable-setting code and source vars.sh last

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-30 10:18:19 UTC (rev 461)
+++ sysvinit/trunk/debian/changelog	2005-12-30 10:27:01 UTC (rev 462)
@@ -5,6 +5,7 @@
   * Previous release also closed: #227540
   * umountfs: Only run umount if there is something to unmount
     (Closes: #345272)
+  * urandom: Add PATH so that find can be found  (Closes: #345273)
 
   [ Petter Reinholdtsen ]
   * sysv-rc: Fix some typos in the startpar handling.  Patches from Mark

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-30 10:18:19 UTC (rev 461)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-12-30 10:27:01 UTC (rev 462)
@@ -23,26 +23,20 @@
 
 PATH=/lib/init:/bin:/sbin
 
-. /lib/lsb/init-functions
-. /lib/init/functions.sh
-
 TTYGRP=5
 TTYMODE=620
-if [ -f /etc/default/devpts ]
-then
-	. /etc/default/devpts
-fi
+[ -f /etc/default/devpts ] && . /etc/default/devpts
 
 TMPFS_SIZE=
-if [ -f /etc/default/tmpfs ]
-then
-	. /etc/default/tmpfs
-fi
+[ -f /etc/default/tmpfs ] && . /etc/default/tmpfs
 
 KERNEL="$(uname -s)"
-umask 022
 
+. /lib/lsb/init-functions
+. /lib/init/functions.sh
 
+umask 022
+
 # $1: directory
 is_empty_dir() {
 	for FILE in $1/* $1/.*

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-12-30 10:18:19 UTC (rev 461)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-12-30 10:27:01 UTC (rev 462)
@@ -12,17 +12,17 @@
 
 [ -c /dev/urandom ] || exit 0
 
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+POOLSIZE=512
+[ -f /proc/sys/kernel/random/poolsize ] && POOLSIZE="$(cat /proc/sys/kernel/random/poolsize)"
+
+SAVEDFILE=/var/lib/urandom/random-seed
+
 . /lib/init/vars.sh
 
 . /lib/lsb/init-functions
 
-POOLSIZE=512
-if [ -f /proc/sys/kernel/random/poolsize ]
-then
-	POOLSIZE="$(cat /proc/sys/kernel/random/poolsize)"
-fi
-SAVEDFILE=/var/lib/urandom/random-seed
-
 case "$1" in
   start|"")
 	[ "$VERBOSE" != no ] && log_action_begin_msg "Initializing random number generator"