summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-04-04 10:50:11 +0200
committerDaniel Baumann <daniel@debian.org>2012-04-04 10:50:11 +0200
commit38757eb448bd7e7725085047434df1a4664ddfe2 (patch)
tree8b7d1ac5984497214f1eed34b0aaf00ee0df084e /scripts
parent3b8017136669394c9e2c92aca2d917c98a186b34 (diff)
downloadlive-boot-38757eb448bd7e7725085047434df1a4664ddfe2.tar.gz
live-boot-38757eb448bd7e7725085047434df1a4664ddfe2.zip
Adjusting mount calls when using nfs options (Closes: #667435).
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/live b/scripts/live
index 494abc7..84924c9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -988,9 +988,9 @@ do_nfsmount ()
modprobe -q nfs
- if [ -z "${NFSOPTS}" ]
+ if [ -n "${NFSOPTS}" ]
then
- NFSOPTS=""
+ NFSOPTS="-o ${NFSOPTS}"
fi
log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
@@ -1017,7 +1017,7 @@ do_cifsmount ()
then
CIFSOPTS="-ouser=root,password="
else
- CIFSOPTS="${NFSOPTS}"
+ CIFSOPTS="-o ${NFSOPTS}"
fi
log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"