diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2016-12-06 11:10:00 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2016-12-06 11:10:00 +0000 |
| commit | b88ebddd00593c9cae960df11f413d9db9170650 (patch) | |
| tree | e7170935cbfe23eb204af321f13111d4146b38cf | |
| parent | The kvop is not mandatory to query the type, fixes hostctl -t on vmm(4) VMs. (diff) | |
| download | wireguard-openbsd-b88ebddd00593c9cae960df11f413d9db9170650.tar.xz wireguard-openbsd-b88ebddd00593c9cae960df11f413d9db9170650.zip | |
Catch mtree(8) error; it's only run when applying patches and we already
check for read-only... in this case.
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index e2b341ff038..ea31c3f01b8 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.73 2016/12/06 10:29:04 ajacoutot Exp $ +# $OpenBSD: syspatch.sh,v 1.74 2016/12/06 11:10:00 ajacoutot Exp $ # # Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -245,10 +245,9 @@ sp_cleanup() [[ ${_k} == /bsd.syspatch${_OSrev} ]] || rm ${_k} done - # in case a patch added a new directory (install -D); - # non-fatal in case some mount point is read-only or remote + # in case a patch added a new directory (install -D) for _m in /etc/mtree/{4.4BSD,BSD.x11}.dist; do - [[ -f ${_m} ]] && mtree -qdef ${_m} -p / -U >/dev/null || true + [[ -f ${_m} ]] && mtree -qdef ${_m} -p / -U >/dev/null done } |