summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/turnup
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-25 06:35:35 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-25 06:35:35 +0000
commit55be7fd58ffbdaf8733d8f12556817f6c5617e03 (patch)
treefb9488d34435a8ed7929a9a4da4c7fb4ec42367c /packages/slugos-init/files/turnup
parentc765bc47121d95e8cbc0a6ad71a850e2bcb8f082 (diff)
parent69cd4b590282088c35967213d400e480150d43c8 (diff)
merge of '65908f491852a7129b196ced660449bcc1933f90'
and 'f4dabead7ddd765bb651fb44cd9e5d48fb582330'
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