diff options
| author | Martin Natano <natano@cvs.openbsd.org> | 2016-09-11 06:51:18 +0000 |
|---|---|---|
| committer | Martin Natano <natano@cvs.openbsd.org> | 2016-09-11 06:51:18 +0000 |
| commit | 19a3dd78c524738cc68327ef98a5e3b06ebbba0e (patch) | |
| tree | d44fec1b21e48ff02ec964aa78c46ac905c61b73 /etc/Makefile | |
| parent | 8a5cc54d58219311cc97d8f365fe839c8093ede9 (diff) | |
The /etc/{localtime,rmt}, /var/tmp and /sys symlinks and the etc tarball
should be owned by root.
ok deraadt
Diffstat (limited to 'etc/Makefile')
| -rw-r--r-- | etc/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile index edd13915bad..887de5996b1 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.430 2016/09/03 13:37:40 guenther Exp $ +# $OpenBSD: Makefile,v 1.431 2016/09/11 06:51:17 natano Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -154,7 +154,9 @@ distribution-etc-root-var: distrib-dirs ${INSTALL} -c -o root -g wheel -m 644 *.pub \ ${DESTDIR}/etc/signify ln -fs ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime + chown -h root:wheel ${DESTDIR}/etc/localtime ln -fs /usr/sbin/rmt ${DESTDIR}/etc/rmt + chown -h root:wheel ${DESTDIR}/etc/rmt ${INSTALL} -c -o root -g wheel -m 644 minfree \ ${DESTDIR}/var/crash ${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \ @@ -206,6 +208,7 @@ distribution-etc-root-var: distrib-dirs ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${RCDAEMONS} \ ${DESTDIR}/etc/rc.d cd ${DESTDIR}/var; ln -fs ../tmp + chown -h root:wheel ${DESTDIR}/var/tmp touch ${DESTDIR}/var/sysmerge/etcsum cd ${DESTDIR}/ && \ sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ @@ -213,6 +216,7 @@ distribution-etc-root-var: distrib-dirs cd ${DESTDIR}/ && \ sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \ pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz + chown root:wheel ${DESTDIR}/var/sysmerge/etc.tgz distribution: exec ${SUDO} ${MAKE} distribution-etc-root-var @@ -227,6 +231,7 @@ distrib-dirs: ${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/src; \ fi cd ${DESTDIR}/; ln -fhs usr/src/sys sys + chown -h root:wheel ${DESTDIR}/sys .ifndef RELEASEDIR release: |