summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/boot
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2008-08-24 23:49:44 +0000
committerMike Westerhof <mwester@dls.net>2008-08-24 23:49:44 +0000
commitfb1cee2982dbd566111e6dcd5766b7721583513b (patch)
treee079ceebf24b03251c5a029fdac595d2ce4ba488 /packages/slugos-init/files/boot
parent2a3a5812f4a2752fefc847d65d0a1b3ede3f0b4f (diff)
SlugOS 5 - replace "mount -U" with "mount UUID=" which works with both mount
and busybox mount; also update boot/disk script to ensure that some key devices exist in the new /dev which will enable booting to a virgin nfsroot.
Diffstat (limited to 'packages/slugos-init/files/boot')
-rw-r--r--packages/slugos-init/files/boot/disk9
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index d47be54c37..63370ce340 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -38,12 +38,13 @@ then
# is attempted.
if test -n "$UUID" &&
mount "$@" UUID="$UUID" /mnt ||
- mount "$@" -U "$UUID" /mnt ||
mount "$@" "$device" /mnt
then
- # checkmount checks for sh, chroot, init
- # and /mnt (i.e. /mnt/mnt in this case)
- if checkmount /mnt
+ # checkmount checks for sh, chroot, init, /dev
+ # and /mnt (i.e. /mnt/mnt in this case).
+ # minimaldevnodes checks (and creates if required)
+ # a few mandatory /dev nodes we may need.
+ if checkmount /mnt && minimaldevnodes /mnt
then
# pivot to /initrd if available, else /mnt
cd /