summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/boot/disk
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-25 12:35:41 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-25 12:35:41 +0000
commit64ff4d57e39e9fad1385c00b4665afa5d66c75f3 (patch)
treead51678b0114a7afc784507cc686efa5a5980fd3 /packages/slugos-init/files/boot/disk
parent170632400a39c176bb6678cfaa63f12c2b28d9ab (diff)
parentad284adbc15624a03ffa9d912bcd59d7ac5c4a0a (diff)
merge of '19345cff74205f76f6a9f18a8cbd4dd6bb2f4298'
and 'ae7c41d4de5eda76de5c1cb6a2a4fe160fbc9a1d'
Diffstat (limited to 'packages/slugos-init/files/boot/disk')
-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 /