X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot.sh;h=736e5879e1f29e121bdfcadcbf01ef31101b9716;hb=refs%2Ftags%2Fdebian%2F3.0_a30-1;hp=6304c978e3b89ef2894703fbae505a3c6081763f;hpb=a76532ce1ffc67df5f94b1483e53661756112584;p=live-boot-grml.git

diff --git a/scripts/boot.sh b/scripts/boot.sh
index 6304c97..736e587 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -630,11 +630,20 @@ mountroot ()
 		log_end_msg
 	fi
 
-	maybe_break live-bottom
-	log_begin_msg "Running /scripts/live-bottom\n"
+	if ! [ -d "/root/usr/share/live-boot" ]
+	then
+		panic "A wrong rootfs was mounted."
+	fi
 
-	run_scripts /scripts/live-bottom
-	log_end_msg
+	persistence_exclude
+	fstab
+	Netbase
+
+	case "${LIVE_SWAPON}" in
+		true)
+			Swapon
+			;;
+	esac
 
 	if [ "${UNIONFS}" = unionfs-fuse ]
 	then