summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2016-05-14 16:14:40 +0000
committerajacoutot <ajacoutot@openbsd.org>2016-05-14 16:14:40 +0000
commitc4c2b77119fa00d04aef12d86e0d51320e5427e9 (patch)
tree75acc5098ef8c40562b88997d815d047992edf12 /usr.sbin/sysmerge
parentsome misplaced man pages spotted by aja (diff)
downloadwireguard-openbsd-c4c2b77119fa00d04aef12d86e0d51320e5427e9.tar.xz
wireguard-openbsd-c4c2b77119fa00d04aef12d86e0d51320e5427e9.zip
Be gone /var/sysmerge/examplessum.
Diffstat (limited to 'usr.sbin/sysmerge')
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index ad5bdadcaa5..9a48110f41b 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.225 2016/05/14 14:44:35 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.226 2016/05/14 16:14:40 ajacoutot Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -184,6 +184,8 @@ sm_run() {
cp -fp /usr/share/sysmerge/*sum /var/sysmerge/ 2>/dev/null
rm -rf /usr/share/sysmerge
fi
+ # XXX remove after OPENBSD_6_1
+ rm -f /var/sysmerge/examplessum
sm_extract_sets
sm_add_user_grp