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

diff --git a/scripts/live b/scripts/live
index 3e604f6..7ee3e7f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -150,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
@@ -235,11 +210,6 @@ Arguments ()
 				export NOAUTOLOGIN
 				;;
 
-			noconsolekeyboard)
-				NOCONSOLEKEYBOARD="Yes"
-				export NOCONSOLEKEYBOARD
-				;;
-
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -776,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"
@@ -806,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}