summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2016-09-05 11:29:34 +0000
committerrobert <robert@openbsd.org>2016-09-05 11:29:34 +0000
commit385d50f6d929370a98189999cff6c837f0f7eb64 (patch)
tree204ae95bcec7c43679fdee2316f9bd53e47083f7
parentNo need to install the /var/syspatch/$REL directory, the binpatch does it for us. (diff)
downloadwireguard-openbsd-385d50f6d929370a98189999cff6c837f0f7eb64.tar.xz
wireguard-openbsd-385d50f6d929370a98189999cff6c837f0f7eb64.zip
use a for loop for mtree for the two spec files
and add a better comment ok ajacoutot@
-rw-r--r--usr.sbin/syspatch/syspatch.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh
index 5e2e13af079..605fc5493e8 100644
--- a/usr.sbin/syspatch/syspatch.sh
+++ b/usr.sbin/syspatch/syspatch.sh
@@ -1,6 +1,6 @@
#!/bin/ksh
#
-# $OpenBSD: syspatch.sh,v 1.2 2016/09/05 11:26:18 ajacoutot Exp $
+# $OpenBSD: syspatch.sh,v 1.3 2016/09/05 11:29:34 robert Exp $
#
# Copyright (c) 2016 Antoine Jacoutot <ajacoutot@openbsd.org>
#
@@ -62,9 +62,10 @@ apply_patches()
install_patch "${_patch}" || return
done
- # XXX needed? -- non-fatal
- mtree -qdef /etc/mtree/4.4BSD.dist -p / -U >/dev/null || true
- mtree -qdef /etc/mtree/BSD.x11.dist -p / -U >/dev/null || true
+ # non-fatal -- the syspatch tarball should have correct permissions
+ for _m in 4.4BSD BSD.x11; do
+ mtree -qdef /etc/mtree/${_m}.dist -p / -U >/dev/null || true
+ done
}
create_rollback()