diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-16 12:50:43 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-16 12:50:43 +0000 |
commit | 08e78f5bf2c0a8bd7bd096ecc3a0eed2a2ca543f (patch) | |
tree | cb72efa99fad540c297fa5111b15da98a77991b5 /etc | |
parent | 1182cc4dc9749bfcc5806e705550f4d72eae60ae (diff) |
the files listed under BIN1 are not binaries in any way. Let's call
them what they are: MUTABLE, as in these are the specific files that
admins do edit in /etc
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index 2c04132cec9..6b40a402fe0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.379 2014/07/16 12:46:16 deraadt Exp $ +# $OpenBSD: Makefile,v 1.380 2014/07/16 12:50:42 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -30,14 +30,14 @@ kernels: bootblocks ${ALL_KERNELS} # -rw-r--r-- BINOWN= root BINGRP= wheel -BIN1= changelist csh.cshrc csh.login csh.logout daily dhclient.conf \ +MUTABLE=changelist csh.cshrc csh.login csh.logout daily dhclient.conf \ etc.${MACHINE}/disktab etc.${MACHINE}/login.conf \ ftpusers gettytab group hosts ksh.kshrc locate.rc \ mailer.conf man.conf mixerctl.conf moduli monthly motd \ myname netstart networks newsyslog.conf pf.os protocols \ rc rc.conf rpc services shells syslog.conf weekly .if ${MACHINE} != "aviion" -BIN1+= wsconsctl.conf +MUTABLE+=wsconsctl.conf .endif EXAMPLES=chio.conf dhcpd.conf exports ftpchroot hosts.lpd ifstated.conf \ @@ -91,7 +91,7 @@ distribution-etc-root-var distribution distrib-dirs release: @false .else distribution-etc-root-var: distrib-dirs - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${MUTABLE} ${DESTDIR}/etc ksh ttys.pty | cat etc.${MACHINE}/ttys - > ${DESTDIR}/etc/ttys && \ chown ${BINOWN} ${DESTDIR}/etc/ttys && \ chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \ |