X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot.sh;h=6304c978e3b89ef2894703fbae505a3c6081763f;hb=f4d4be1f0223a2e888286988503ea26fee2a8324;hp=0b18a9c0dd21843c8c4887910fabad05231e805d;hpb=6d3f4fd5557f5efc83c42374417f4a05e99d3744;p=live-boot-grml.git

diff --git a/scripts/boot.sh b/scripts/boot.sh
index 0b18a9c..6304c97 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -2,6 +2,12 @@
 
 # set -e
 
+if [ -e /scripts/functions ]
+then
+	# initramfs-tools specific (FIXME)
+	. /scripts/functions
+fi
+
 for _SCRIPT in /lib/live/boot/*
 do
 	if [ -e "${_SCRIPT}" ]
@@ -423,32 +429,6 @@ find_livefs ()
 	return 1
 }
 
-integrity_check ()
-{
-	media_mountpoint="${1}"
-
-	log_begin_msg "Checking media integrity"
-
-	cd ${media_mountpoint}
-	/bin/md5sum -c md5sum.txt < /dev/tty8 > /dev/tty8
-	RC="${?}"
-
-	log_end_msg
-
-	if [ "${RC}" -eq 0 ]
-	then
-		log_success_msg "Everything ok, will reboot in 10 seconds."
-		sleep 10
-		cd /
-		umount ${media_mountpoint}
-		sync
-		echo u > /proc/sysrq-trigger
-		echo b > /proc/sysrq-trigger
-	else
-		panic "Not ok, a media defect is likely, switch to VT8 for details."
-	fi
-}
-
 mountroot ()
 {
 	if [ -x /scripts/local-top/cryptroot ]; then
@@ -462,15 +442,24 @@ mountroot ()
 	tail -f boot.log >&7 &
 	tailpid="${!}"
 
-	# Ensure 'panic' function is overridden
-	. /scripts/live-functions
+	. /live.vars
 
-	Arguments
+	_CMDLINE="$(cat /proc/cmdline)"
+	Cmdline
 
-	maybe_break live-premount
-	log_begin_msg "Running /scripts/live-premount"
-	run_scripts /scripts/live-premount
-	log_end_msg
+	case "${LIVE_DEBUG}" in
+		true)
+			set -x
+			;;
+	esac
+
+	case "${LIVE_READ_ONLY}" in
+		true)
+			Read_only
+			;;
+	esac
+
+	Select_eth_device
 
 	# Needed here too because some things (*cough* udev *cough*)
 	# changes the timeout
@@ -528,10 +517,11 @@ mountroot ()
 		panic "Unable to find a medium containing a live file system"
 	fi
 
-	if [ "${INTEGRITY_CHECK}" ]
-	then
-		integrity_check "${livefs_root}"
-	fi
+	case "${LIVE_VERIFY_CHECKSUMS}" in
+		true)
+			Verify_checksums "${livefs_root}"
+			;;
+	esac
 
 	if [ "${TORAM}" ]
 	then