X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=7ee3e7f39098eb77e7f5c0b75b1d070bf8310019;hb=37553aee8bbf9550c838d1810706b54b457c6680;hp=5c6a82e7ffebd87720ee6b28d2be7e855ff5d63b;hpb=074f7c2e0d98093e60adbf30c994147c353cab7c;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 5c6a82e..7ee3e7f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -34,9 +34,6 @@ then
 	touch /etc/mtab
 fi
 
-[ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME
-
 . /scripts/live-helpers
 
 if [ ! -f /live.vars ]
@@ -54,18 +51,14 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAPTCDROM="Yes"
 				NOAUTOLOGIN="Yes"
 				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
-				NOHOSTS="Yes"
 				NONETWORKING="Yes"
-				NOTIMEZONE="Yes"
 				NOXAUTOCONFIG="Yes"
-				NOXAUTOLOGIN="Yes"
 
-				export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
+				export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG
 				;;
 
 			access=*)
@@ -136,18 +129,6 @@ Arguments ()
 				export FROMISO
 				;;
 
-			username=*)
-				USERNAME="${ARGUMENT#username=}"
-				LIVECONF="changed"
-				export USERNAME LIVECONF
-				;;
-
-			userfullname=*)
-				USERFULLNAME="${ARGUMENT#userfullname=}"
-				LIVECONF="changed"
-				export USERFULLNAME LIVECONF
-				;;
-
 			ignore_uuid)
 				IGNORE_UUID="Yes"
 				export IGNORE_UUID
@@ -169,31 +150,6 @@ Arguments ()
 				export STATICIP
 				;;
 
-			keyb=*|kbd-chooser/method=*)
-				KBD="${ARGUMENT#*=}"
-				export KBD
-				;;
-
-			klayout=*|console-setup/layoutcode=*)
-				KLAYOUT="${ARGUMENT#*=}"
-				export KLAYOUT
-				;;
-
-			kvariant=*|console-setup/variantcode=*)
-				KVARIANT="${ARGUMENT#*=}"
-				export KVARIANT
-				;;
-
-			kmodel=*|console-setup/modelcode=*)
-				KMODEL="${ARGUMENT#*=}"
-				export KMODEL
-				;;
-
-			koptions=*)
-				KOPTIONS="${ARGUMENT#koptions=}"
-				export KOPTIONS
-				;;
-
 			live-getty)
 				LIVE_GETTY="1"
 				export LIVE_GETTY
@@ -249,26 +205,11 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noaptcdrom)
-				NOAPTCDROM="Yes"
-				export NOAPTCDROM
-				;;
-
 			noautologin)
 				NOAUTOLOGIN="Yes"
 				export NOAUTOLOGIN
 				;;
 
-			noxautologin)
-				NOXAUTOLOGIN="Yes"
-				export NOXAUTOLOGIN
-				;;
-
-			noconsolekeyboard)
-				NOCONSOLEKEYBOARD="Yes"
-				export NOCONSOLEKEYBOARD
-				;;
-
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -279,11 +220,6 @@ Arguments ()
 				export NOFSTAB
 				;;
 
-			nohosts)
-				NOHOSTS="Yes"
-				export NOHOSTS
-				;;
-
 			nonetworking)
 				NONETWORKING="Yes"
 				export NONETWORKING
@@ -299,11 +235,6 @@ Arguments ()
 				export NOXAUTOCONFIG
 				;;
 
-			noxscreensaver)
-				NOXSCREENSAVER="Yes"
-				export NOXSCREENSAVER
-				;;
-
 			persistent)
 				PERSISTENT="Yes"
 				export PERSISTENT
@@ -367,21 +298,6 @@ Arguments ()
 				export SILENT
 				;;
 
-			textonly)
-				TEXTONLY="Yes"
-				export TEXTONLY
-				;;
-
-			timezone=*)
-				TIMEZONE="${ARGUMENT#timezone=}"
-				export TIMEZONE
-				;;
-
-			notimezone)
-				NOTIMEZONE="Yes"
-				export NOTIMEZONE
-				;;
-
 			todisk=*)
 				TODISK="${ARGUMENT#todisk=}"
 				export TODISK
@@ -830,6 +746,7 @@ do_httpmount ()
 						fi
 						modprobe fuse
 						$FUSE_MOUNT "${url}" "${dest}"
+						FUSE_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
 					fi
 					[ ${?} -eq 0 ] && rc=0
 					[ "${extension}" = "tgz" ] && live_dest="ram"
@@ -860,6 +777,9 @@ do_httpmount ()
 	elif [ "${webfile}"  != "FETCH" ] ; then
 		NETBOOT="${webfile}"
 		export NETBOOT
+		if [ -n "${FUSE_PID}" ] ; then
+			echo "${FUSE_PID}" > ${mountpoint}/root.pid
+		fi
 	fi
 
 	return ${rc}
@@ -1829,8 +1749,4 @@ mountroot ()
 	exec 2>&7 7>&-
 	kill ${tailpid}
 	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
-	if [ -f /etc/live.conf ]
-	then
-		cp /etc/live.conf "${rootmnt}/etc/"
-	fi
 }