diff options
| author | feld <feld@FreeBSD.org> | 2014-11-18 13:38:09 +0000 |
|---|---|---|
| committer | feld <feld@FreeBSD.org> | 2014-11-18 13:38:09 +0000 |
| commit | d6722f4d2ce31fb08d12bb4c96aaec4402da085f (patch) | |
| tree | 7eea535034c454c8414051af833c00ee76c320c9 /usr.sbin | |
| parent | b87d94c5dfc76a8e9dd71d35b3968711ec7f876b (diff) | |
| download | FreeBSD-src-d6722f4d2ce31fb08d12bb4c96aaec4402da085f.zip FreeBSD-src-d6722f4d2ce31fb08d12bb4c96aaec4402da085f.tar.gz | |
Re-work non-persistent filesystem detection as it was not possible to
detect /dev/md backed mfs filesystems that way.
Differential Revision: https://reviews.freebsd.org/D1163
Approved by: ian
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index a8ece5b..f586909 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -604,14 +604,13 @@ fetchupgrade_check_params () { echo ${WORKDIR} exit 1 fi - for i in tmpfs mdmfs; do - if df -t ${i} ${WORKDIR} >/dev/null 2>1; then - echo -n "`basename $0`: " - echo -n "${_WORKDIR_bad2}" - echo ${WORKDIR} - exit 1 - fi - done + case `df -T ${WORKDIR}` in */dev/md[0-9]* | *tmpfs*) + echo -n "`basename $0`: " + echo -n "${_WORKDIR_bad2}" + echo ${WORKDIR} + exit 1 + ;; + esac chmod 700 ${WORKDIR} cd ${WORKDIR} || exit 1 |
