summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/turnup
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/turnup
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/turnup')
-rw-r--r--packages/slugos-init/files/turnup6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 4aa1fba3ed..2bbc9024ef 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -578,7 +578,7 @@ disk() {
fso="$(fsoptions "$@")"
if if test -n "$uuid"
then
- mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new"
+ mount "$@" UUID="$uuid" "$new"
else
mount "$@" "$device" "$new"
fi
@@ -591,7 +591,7 @@ disk() {
if test -n "$fst" &&
if test -n "$uuid"
then
- mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new"
+ mount -t "$fst" -o "$fso" UUID="$uuid" "$new"
else
mount -t "$fst" -o "$fso" "$device" "$new"
fi
@@ -633,7 +633,7 @@ disk() {
then
echo " options used: -t $fst -o $fso [error in this script]" >&2
test -n "$uuid" &&
- echo " uuid: $uuid (passed with UUID= or -U)" >&2
+ echo " uuid: $uuid (passed with UUID=<uuid>)" >&2
fi
fi