summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/turnup
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/turnup
parent170632400a39c176bb6678cfaa63f12c2b28d9ab (diff)
parentad284adbc15624a03ffa9d912bcd59d7ac5c4a0a (diff)
merge of '19345cff74205f76f6a9f18a8cbd4dd6bb2f4298'
and 'ae7c41d4de5eda76de5c1cb6a2a4fe160fbc9a1d'
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