livecd: livecd - more checks

[havner]

Author: havner                       Date: Mon Jul 10 14:18:57 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- more checks

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

---- Diffs:

================================================================
Index: livecd/livecd
diff -u livecd/livecd:1.8 livecd/livecd:1.9
--- livecd/livecd:1.8	Mon Jul 10 16:10:48 2006
+++ livecd/livecd	Mon Jul 10 16:18:52 2006
@@ -21,7 +21,7 @@
 	start|restart|reload|force-reload)
 	CHARS="LiveCD: "
 
-	if [ "$CONFIG_DHCP" = "yes" ] && ! getparam nonet; then
+	if [ "$CONFIG_DHCP" = "yes" -a "$CONFIG_NET" = "yes" ] && ! 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" ] && ! getparam nosound; then
+	if [ "$CONFIG_MIXER" = "yes" -a "$CONFIG_SOUND" = "yes" ] && ! getparam nomixer && ! getparam nosound; then
 		show "Loading mixer settings for detected audio devices"
 		busy
 		COUNT=0
================================================================

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