livecd: livecd - check for programs existance

[havner]

Author: havner                       Date: Wed Jul 12 08:42:58 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- check for programs existance

---- Files affected:
livecd:
   livecd (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: livecd/livecd
diff -u livecd/livecd:1.9 livecd/livecd:1.10
--- livecd/livecd:1.9	Mon Jul 10 16:18:52 2006
+++ livecd/livecd	Wed Jul 12 10:42:53 2006
@@ -21,7 +21,7 @@
 	start|restart|reload|force-reload)
 	CHARS="LiveCD: "
 
-	if [ "$CONFIG_DHCP" = "yes" -a "$CONFIG_NET" = "yes" ] && ! getparam nodhcp && ! getparam nonet; then
+	if [ "$CONFIG_DHCP" = "yes" -a "$CONFIG_NET" = "yes" -a -x `which dhcpcd` ] && ! 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
@@ -36,7 +36,7 @@
 		done
 	fi
 
-	if [ "$CONFIG_MIXER" = "yes" -a "$CONFIG_SOUND" = "yes" ] && ! getparam nomixer && ! getparam nosound; then
+	if [ "$CONFIG_MIXER" = "yes" -a "$CONFIG_SOUND" = "yes" -a -x `which aumix` ] && ! getparam nomixer && ! getparam nosound; then
 		show "Loading mixer settings for detected audio devices"
 		busy
 		COUNT=0
@@ -55,7 +55,7 @@
 	;;
 	stop)
 	CHARS="LiveCD: "
-	if [ "`cat /proc/mounts | grep \/home\/users`" != "" ]; then
+	if [ "`cat /proc/mounts | grep \/home\/users`" != "" -a -x `which lsof` ]; 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.9&r2=1.10&f=u