diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-10-02 11:53:46 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-10-02 11:53:46 +0000 |
| commit | 1b52465d39d0f66243ba3e820085675336cf0a86 (patch) | |
| tree | cf997a90aaac5a6424e559f4bca6b2bca59134d5 | |
| parent | e5d04fbb955b80656e6766c287a8e4022b2b4331 (diff) | |
Use BSD.x11.dist mtree file now that it is up-to-date and maintained.
ok sthen@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 38a07deb033..07fadd9dc45 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.51 2009/08/24 19:14:13 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.52 2009/10/02 11:53:45 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -570,6 +570,9 @@ do_compare() { do_post() { echo "===> Making sure your directory hierarchy has correct perms, running mtree" mtree -qdef ${DESTDIR}/etc/mtree/4.4BSD.dist -p ${DESTDIR:=/} -U > /dev/null + if [ -n "${XTGZ}" ]; then + mtree -qdef ${DESTDIR}/etc/mtree/BSD.x11.dist -p ${DESTDIR:=/} -U > /dev/null + fi if [ "${NEED_NEWALIASES}" ]; then echo "===> A new ${DESTDIR}/etc/mail/aliases file was installed." >> ${REPORT} |