From: Daniel Baumann <daniel@debian.org>
Date: Tue, 5 Jun 2012 16:45:31 +0000 (+0200)
Subject: Moving validateroot bottom script into main boot script itself.
X-Git-Tag: debian/3.0_a30-1~7
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=dea88df012ab08b3f50999b59b82715d6b09a5cd;hp=6c9872bc5d18f60e6b6ad94bdc18bd217e2119f9;p=live-boot-grml.git

Moving validateroot bottom script into main boot script itself.
---

diff --git a/initramfs-tools/scripts/live-bottom/10validateroot b/initramfs-tools/scripts/live-bottom/10validateroot
deleted file mode 100755
index 3946306..0000000
--- a/initramfs-tools/scripts/live-bottom/10validateroot
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# Error out in case a "wrong" file system was chosen.
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# FIXME: stop hardcoding overloading of initramfs-tools functions
-. /scripts/functions
-. /lib/live/boot/initramfs-tools.sh
-
-if ! [ -d "/root/usr/share/live-boot" ]
-then
-	panic "A wrong rootfs was mounted."
-fi
diff --git a/scripts/boot.sh b/scripts/boot.sh
index 02ac43a..94f5e18 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -630,6 +630,11 @@ mountroot ()
 		log_end_msg
 	fi
 
+	if ! [ -d "/root/usr/share/live-boot" ]
+	then
+		panic "A wrong rootfs was mounted."
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"