X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=b883c92c711b5e488e952d32da75400adb3c7704;hb=3f8f80aaa412cb212e6c35082df9028d97967a9a;hp=7a0a78e3c9598ae8c3f61397aed449ba3d070c7c;hpb=fdd8036ba32ad88e83a61191cc4597ae060355d2;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 7a0a78e..b883c92 100755
--- a/scripts/live
+++ b/scripts/live
@@ -170,6 +170,11 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
+			noapparmor)
+				NOAPPARMOR="Yes"
+				export NOAPPARMOR
+				;;
+
 			noaptcdrom)
 				NOAPTCDROM="Yes"
 				export NOAPTCDROM
@@ -585,17 +590,17 @@ do_netmount ()
 
 	ipconfig ${DEVICE} | tee /netboot.config
 
-	if [ "${NFSROOT}" = "auto" ]
-	then
-		NFSROOT=${ROOTSERVER}:${ROOTPATH}
-	fi
-
 	# source relevant ipconfig output
 	OLDHOSTNAME=$HOSTNAME
 	. /tmp/net-${DEVICE}.conf
 	[ -z $HOSTNAME ] && HOSTNAME=$OLDHOSTNAME
 	export HOSTNAME
 
+	if [ "${NFSROOT}" = "auto" ]
+	then
+		NFSROOT=${ROOTSERVER}:${ROOTPATH}
+	fi
+
 	if [ -n "${FETCH}" ] && do_httpmount
 	then
 		rc=0