X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=412094aee2b4990b231e064e71da8d423ed4abee;hb=ed0ef79a722eff0140c5521b63e80283054e416e;hp=2e40b45c4801d2a93861ae8ebae849a94ac2166b;hpb=a3ac28c3dfe8f4d77c10eb8fa92f96ef19bf1c68;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 2e40b45..412094a 100755
--- a/scripts/live
+++ b/scripts/live
@@ -51,14 +51,11 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAUTOLOGIN="Yes"
-				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
 				NONETWORKING="Yes"
-				NOXAUTOCONFIG="Yes"
 
-				export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG
+				export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
 				;;
 
 			access=*)
@@ -218,11 +215,6 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noautologin)
-				NOAUTOLOGIN="Yes"
-				export NOAUTOLOGIN
-				;;
-
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -243,11 +235,6 @@ Arguments ()
 				export SWAPON
 				;;
 
-			noxautoconfig)
-				NOXAUTOCONFIG="Yes"
-				export NOXAUTOCONFIG
-				;;
-
 			persistent)
 				PERSISTENT="Yes"
 				export PERSISTENT
@@ -351,21 +338,6 @@ Arguments ()
 				UNIONTYPE="${ARGUMENT#union=}"
 				export UNIONTYPE
 				;;
-
-			xdebconf)
-				XDEBCONF="Yes"
-				export XDEBCONF
-				;;
-
-			xdriver=*)
-			        XDRIVER="${ARGUMENT#xdriver=}"
-				export XDRIVER
-				;;
-
-			xvideomode=*)
-				XVIDEOMODE="${ARGUMENT#xvideomode=}"
-				export XVIDEOMODE
-				;;
 		esac
 	done
 
@@ -757,6 +729,8 @@ do_iscsi()
 		do
 			if check_dev "null" "/dev/$dev"
 			then
+				NETBOOT="iscsi"
+				export NETBOOT
 				return 0;
 			fi
 		done
@@ -764,8 +738,6 @@ do_iscsi()
 	else
 		panic "Failed to locate iSCSI host in /sys"
 	fi
-	NETBOOT="iscsi"
-	export NETBOOT
 }
 
 do_httpmount ()