X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-main.sh;h=b9bd71b9febc6269f31a4f606d7ae35d181ec63c;hb=27bc786ffea0c796827b628fb48fcdd755eace9d;hp=4a965d52caf0b67ebdeb3c48b6a62318ee3cec6a;hpb=683095685ccdd4175b75293540aabe239d03a6bb;p=live-boot-grml.git

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 4a965d5..b9bd71b 100755
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -111,10 +111,10 @@ Live ()
 	then
 		losetup -d /dev/loop0
 
-		if is_mountpoint /live/fromiso
+		if is_mountpoint /run/live/fromiso
 		then
-			umount /live/fromiso
-			rmdir --ignore-fail-on-non-empty /live/fromiso \
+			umount /run/live/fromiso
+			rmdir --ignore-fail-on-non-empty /run/live/fromiso \
 				>/dev/null 2>&1 || true
 		fi
 	fi
@@ -174,11 +174,23 @@ Live ()
 		panic "A wrong rootfs was mounted."
 	fi
 
+	# avoid breaking existing user scripts that rely on the old path
+	# this includes code that checks what is mounted on /lib/live/mount/*
+	# (eg: grep /lib/live /proc/mount)
+	# XXX: to be removed before the bullseye release
+	mkdir -p ${rootmnt}/lib/live/mount
+	mount --rbind /run/live ${rootmnt}/lib/live/mount
+
 	Fstab
-	Netbase
 
 	Swap
 
+	if grep -q debian_networking /proc/cmdline ; then
+		Netbase
+	else
+		Grml_Networking
+	fi
+
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}