X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=e17f66ff17ed6605080a5496731d6407132f98be;hb=49aa88ba4e31f04f69ab211a1679c4f01c3475e9;hp=fa76eb15970cbbb5f7dd19ddd89ec5ef289a9042;hpb=0b23566984bd09f571b00153f351dbf7e32c6185;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index fa76eb1..e17f66f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -49,6 +49,35 @@ Arguments ()
 	for ARGUMENT in $(cat /proc/cmdline)
 	do
 		case "${ARGUMENT}" in
+			skipconfig)
+				NOACCESSIBILITY="Yes"
+				NOAPPARMOR="Yes"
+				NOAPTCDROM="Yes"
+				NOAUTOLOGIN="Yes"
+				NOCONSOLEKEYBOARD="Yes"
+				NOFASTBOOT="Yes"
+				NOFSTAB="Yes"
+				NOGNOMEPANEL="Yes"
+				NOHOSTS="Yes"
+				NOJOCKEY="Yes"
+				NOKPERSONALIZER="Yes"
+				NOLANGUAGESELECTOR="Yes"
+				NOLOCALES="Yes"
+				NONETWORKING="Yes"
+				NOPOLKITCONF="Yes"
+				NOPOWERMANAGEMENT="Yes"
+				NOPROGRAMCRASHES="Yes"
+				NOSUDO="Yes"
+				NOTIMEZONE="Yes"
+				NOUPDATENOTIFIER="Yes"
+				NOUSER="Yes"
+				NOXAUTOCONFIG="Yes"
+				NOXAUTOLOGIN="Yes"
+				NOXSCREENSAVER="Yes"
+
+				export NOACCESSIBILITY NOAPPARMOR NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOGNOMEPANEL NOHOSTS NOJOCKEY NOKPERSONALIZER NOLANGUAGESELECTOR NOLOCALES NONETWORKING NOPOLKITCONF NOPOWERMANAGEMENT NOPROGRAMCRASHES NOSUDO NOTIMEZONE NOUPDATENOTIFIER NOUSER NOXAUTOCONFIG NOXAUTOLOGIN NOXSCREENSAVER
+				;;
+
 			access=*)
 				ACCESS="${ARGUMENT#access=}"
 				export ACCESS
@@ -66,6 +95,11 @@ Arguments ()
 				set -x
 				;;
 
+			ethdevice=*)
+				DEVICE="${ARGUMENT#ethdevice=}"
+				export DEVICE
+				;;
+
 			fetch=*)
                                 FETCH="${ARGUMENT#fetch=}"
                                 export FETCH
@@ -385,9 +419,9 @@ Arguments ()
 				mount -o bind /dev /root/dev
 
 				mkdir -p /root/var/run/network
-				chroot /root dhclient eth0
+				[ "${NETBOOT}" ] || chroot /root dhclient eth0
 				chroot /root wget -P /tmp "${location}"
-				chroot /root ifconfig eth0 down
+				[ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
 
 				umount /root/sys
 				umount /root/proc
@@ -616,7 +650,7 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-)"
+	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-mmc)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'