diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-01-27 10:38:45 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-01-27 10:39:21 -0200 |
| commit | f76cbd6ffea4753abae87efae1d7a73bde67f3cd (patch) | |
| tree | 7b990544b5f43d84dc7dfaf6ab4e952d82db0801 /usr/local/sbin | |
| parent | 6a32a3e4bd5d63bfe3add80ab5af7f582ba400f7 (diff) | |
| download | pfsense-f76cbd6ffea4753abae87efae1d7a73bde67f3cd.zip pfsense-f76cbd6ffea4753abae87efae1d7a73bde67f3cd.tar.gz | |
Fix sed syntax, -i requires a space before the parameter. Also fix regex to find swap device
Diffstat (limited to 'usr/local/sbin')
| -rwxr-xr-x | usr/local/sbin/ufslabels.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/sbin/ufslabels.sh b/usr/local/sbin/ufslabels.sh index 8a6c211..0304a06 100755 --- a/usr/local/sbin/ufslabels.sh +++ b/usr/local/sbin/ufslabels.sh @@ -48,7 +48,7 @@ get_ufsid() { find_fs_device(){ unset DEV - DEV=`/usr/bin/grep -e "[[:blank:]]${1}[[:blank:]]" ${FSTAB} | awk '{print $1;}'` + DEV=`/usr/bin/grep -e "[[:blank:]]*${1}[[:blank:]]" ${FSTAB} | awk '{print $1;}'` DEV=${DEV##/dev/} } @@ -67,7 +67,7 @@ do if [ ${LEN} -ne 16 ]; then echo "Invalid UFS ID for FS ${FS} ($UFSID), skipping" else - /usr/bin/sed -i'' -e "s/${DEV}/ufsid\/${UFSID}/g" ${FSTAB}.tmp + /usr/bin/sed -i '' -e "s/${DEV}/ufsid\/${UFSID}/g" ${FSTAB}.tmp NEED_CHANGES=true fi else @@ -86,7 +86,7 @@ do SWAPDEV=${DEV} echo "FS: Swap slice ${SWAPNUM} on device ${SWAPDEV}" if [ "${SWAPDEV}" != "" ]; then - /usr/bin/sed -i'' -e "s/${SWAPDEV}/label\/swap${SWAPNUM}/g" ${FSTAB}.tmp + /usr/bin/sed -i '' -e "s/${SWAPDEV}/label\/swap${SWAPNUM}/g" ${FSTAB}.tmp NEED_CHANGES=true fi SWAPNUM=`expr ${SWAPNUM} + 1` |
