summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/boot/disk
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-08-27 15:37:19 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-08-27 15:37:19 +0000
commita11270972338aa07727da3a8624adf0ec4289816 (patch)
tree3a2aa4cc3f5b3f8efb969fe3111ebda5919cc266 /packages/slugos-init/files/boot/disk
parent7a527a494ce316a373361024b9e86a779e4a49e8 (diff)
parentf05854e89327463f009e47cad7ed61bd228fb7e9 (diff)
merge of '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'
and '6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0'
Diffstat (limited to 'packages/slugos-init/files/boot/disk')
-rw-r--r--packages/slugos-init/files/boot/disk10
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index a991bc50ac..63370ce340 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -37,12 +37,14 @@ then
# the UUID mount fails a standard device mount
# is attempted.
if test -n "$UUID" &&
- mount "$@" -U "$UUID" /mnt ||
+ mount "$@" UUID="$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 /