livecd: livecd - another fix

[havner]

Author: havner                       Date: Wed Jul 12 09:19:19 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- another fix

---- Files affected:
livecd:
   livecd (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: livecd/livecd
diff -u livecd/livecd:1.12 livecd/livecd:1.13
--- livecd/livecd:1.12	Wed Jul 12 11:11:31 2006
+++ livecd/livecd	Wed Jul 12 11:19:14 2006
@@ -20,7 +20,8 @@
 case "$1" in
 	start|restart|reload|force-reload)
 
-	if [ "$CONFIG_DHCP" = "yes" -a "$CONFIG_NET" = "yes" -a -x "`which dhcpcd`" ] && ! getparam nodhcp && ! getparam nonet; then
+	if [ "$CONFIG_DHCP" = "yes" -a "$CONFIG_NET" = "yes" -a -x "`which dhcpcd 2>/dev/null`" ] \
+			&& ! getparam nodhcp && ! getparam nonet; then
 		for I in `awk '/^[ \t]*alias[ \t]+eth/ {print $2}' /etc/modprobe.conf`; do
 			modprobe $I > /dev/null 2>&1
 		done
@@ -35,7 +36,8 @@
 		done
 	fi
 
-	if [ "$CONFIG_MIXER" = "yes" -a "$CONFIG_SOUND" = "yes" -a -x "`which aumix`" ] && ! getparam nomixer && ! getparam nosound; then
+	if [ "$CONFIG_MIXER" = "yes" -a "$CONFIG_SOUND" = "yes" -a -x "`which aumix 2>/dev/null`" ] \
+	       		&& ! getparam nomixer && ! getparam nosound; then
 		show "Loading mixer settings for detected audio devices"
 		busy
 		COUNT=0
@@ -53,7 +55,7 @@
 	touch /var/lock/subsys/livecd
 	;;
 	stop)
-	if [ "`cat /proc/mounts | grep \/home\/users`" != "" -a -x "`which lsof`" ]; then
+	if [ "`cat /proc/mounts | grep \/home\/users`" != "" -a -x "`which lsof 2>/dev/null`" ]; then
 		for I in `lsof +D /home/users | awk '!/[C]OMMAND/ {print $2}' | sort | uniq`; do
 			kill -15 $I > /dev/null 2>&1
 			kill -9 $I > /dev/null 2>&1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/livecd?r1=1.12&r2=1.13&f=u