summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2016-05-14 16:14:41 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2016-05-14 16:14:41 +0000
commit5b3645912fac0d0b7a8eab07f7671dbffd312a3a (patch)
tree3c6fefcd466ad4d82a549dfe9e22dd1f56b61fd5
parent17719a8595f56caf07c94053eefccd435fb2d5c8 (diff)
Be gone /var/sysmerge/examplessum.
-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