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:38:58 -0200 |
| commit | 802956d6cf263f89f5c36176f5fdaa93679416bf (patch) | |
| tree | a9cdffa79929e3f35d45b9717dccc568059d2138 /usr/local/sbin | |
| parent | a8b61be689a1f8428eecd550e7f4d6d94e157ed7 (diff) | |
| download | pfsense-802956d6cf263f89f5c36176f5fdaa93679416bf.zip pfsense-802956d6cf263f89f5c36176f5fdaa93679416bf.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` |
