diff options
| author | Andrew Jeffery <andrewj@avalon.com.au> | 2013-05-06 14:12:35 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:13:03 +0200 |
| commit | 414e4627258b77b83e822312284d3f385a04f768 (patch) | |
| tree | fb09b7e6f9d8985fbe243d8e3369977f6aaa7a9b /scripts/boot | |
| parent | 10f4622807f9f90514c15445f7ecc1a083c10289 (diff) | |
| download | live-boot-414e4627258b77b83e822312284d3f385a04f768.tar.gz live-boot-414e4627258b77b83e822312284d3f385a04f768.zip | |
Don't quote $CIFSOPTS for mount.cifs (Closes: #703746).
Quoting $CIFSOPTS passed the literal string "-o user=root,password=" to
mount.cifs, killing mount.cifs with a SIGSEGV. Rather, -o should be
properly space delimited by passing $CIFSOPTS unquoted for options to be
parsed correctly.
Diffstat (limited to 'scripts/boot')
| -rwxr-xr-x | scripts/boot/9990-mount-cifs.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/boot/9990-mount-cifs.sh b/scripts/boot/9990-mount-cifs.sh index a8ef3f4..8dd1818 100755 --- a/scripts/boot/9990-mount-cifs.sh +++ b/scripts/boot/9990-mount-cifs.sh @@ -10,7 +10,7 @@ do_cifsmount () then if [ -z "${NFSOPTS}" ] then - CIFSOPTS="-ouser=root,password=" + CIFSOPTS="-o user=root,password=" else CIFSOPTS="-o ${NFSOPTS}" fi @@ -18,7 +18,7 @@ do_cifsmount () log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}" modprobe -q cifs - if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" + if mount.cifs "${NFSROOT}" "${mountpoint}" ${CIFSOPTS} then rc=0 fi |