X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-main.sh;h=0202130c041f20c40ccffd02393fece938dff7c2;hb=f35e0cfae2a2c7b15ed6a38211264b7b26b80a43;hp=bab0bd7a6ba76db3d814804245a93226db4fd675;hpb=a28b96c521b85100e32093b9e65476947a780db3;p=live-boot-grml.git

diff --git a/components/9990-main.sh b/components/9990-main.sh
index bab0bd7..0202130 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,13 +174,24 @@ 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
 
+	Grml_Networking
+
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
-	[ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && cp boot.log "${rootmnt}/var/log/live" 2>/dev/null
+	[ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && ( \
+				cp boot.log "${rootmnt}/var/log/live" 2>/dev/null; \
+				cp fsck.log "${rootmnt}/var/log/live" 2>/dev/null )
 }