summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/turnup
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2008-08-25 06:28:23 +0000
committerMike Westerhof <mwester@dls.net>2008-08-25 06:28:23 +0000
commit3e3b5554c3f5b45dde906d51e0c603e82e4bc1f8 (patch)
tree9bf40f82b79b464ad8daf864f797db34d3713b0e /packages/slugos-init/files/turnup
parentc765bc47121d95e8cbc0a6ad71a850e2bcb8f082 (diff)
parent36c64170765ecb2b2437e9b58d9ff5e262b186a8 (diff)
merge of '65908f491852a7129b196ced660449bcc1933f90'
and 'a7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550'
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