summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/sets/makeetcset9
1 files changed, 5 insertions, 4 deletions
diff --git a/distrib/sets/makeetcset b/distrib/sets/makeetcset
index dcc000b981e..2c9a599e94b 100644
--- a/distrib/sets/makeetcset
+++ b/distrib/sets/makeetcset
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: makeetcset,v 1.1 2014/08/26 20:19:26 rpe Exp $
+# $OpenBSD: makeetcset,v 1.2 2014/09/11 16:59:50 rpe Exp $
#
# Copyright (c) 2014 Robert Peichaer <rpe@openbsd.org>
#
@@ -19,6 +19,7 @@ set -e
CURDIR=$1
MAKE=$2
+BASELISTS=$CURDIR/distrib/sets/lists/base/{mi,md.`machine`}
cleanup() {
[ "X$ETCDIR" != "X" -a -d "/tmp/${ETCDIR#/tmp/}" ] &&
@@ -31,14 +32,14 @@ if [ "X$CURDIR" = "X" -o "X$MAKE" = "X" ]; then
fi
ETCDIR=`mktemp -d /tmp/_etcdir.XXXXXXXXXX`
-ETCSET=$ETCDIR/usr/share/sysmerge/etc.tgz
trap 'cleanup' EXIT
trap 'exit' HUP INT QUIT TERM
cd $CURDIR/etc
$MAKE DESTDIR=$ETCDIR distribution-etc-root-var
-[ -s "$ETCSET" ]
-cp $ETCSET /usr/share/sysmerge/
+
+cd $ETCDIR
+find . \( -type f -o -type l \) -exec fgrep -hx {} $BASELISTS \; | pax -rw -d /
exit 0