diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-05 18:45:31 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-05 19:35:56 +0200 |
| commit | dea88df012ab08b3f50999b59b82715d6b09a5cd (patch) | |
| tree | 37c1663654e557e2726f9bd0f52630b36c1ce71b | |
| parent | 6c9872bc5d18f60e6b6ad94bdc18bd217e2119f9 (diff) | |
| download | live-boot-dea88df012ab08b3f50999b59b82715d6b09a5cd.tar.gz live-boot-dea88df012ab08b3f50999b59b82715d6b09a5cd.zip | |
Moving validateroot bottom script into main boot script itself.
| -rwxr-xr-x | initramfs-tools/scripts/live-bottom/10validateroot | 30 | ||||
| -rwxr-xr-x | scripts/boot.sh | 5 |
2 files changed, 5 insertions, 30 deletions
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" |