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 (executable)
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 (executable)
--- 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"