Browse Source

sysctl.conf moves to etc/examples

OPENBSD_5_6
deraadt 10 years ago
parent
commit
8d60b9304c
3 changed files with 9 additions and 8 deletions
  1. +6
    -5
      src/etc/Makefile
  2. +2
    -2
      src/etc/changelist
  3. +1
    -1
      src/etc/examples/sysctl.conf

+ 6
- 5
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.372 2014/07/14 09:11:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.373 2014/07/15 08:28:43 deraadt Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -101,10 +101,11 @@ distribution-etc-root-var: distrib-dirs
chown ${BINOWN} ${DESTDIR}/etc/ttys && \ chown ${BINOWN} ${DESTDIR}/etc/ttys && \
chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \ chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \
chmod 644 ${DESTDIR}/etc/ttys chmod 644 ${DESTDIR}/etc/ttys
cat sysctl.conf etc.${MACHINE}/sysctl.conf > ${DESTDIR}/etc/sysctl.conf && \
chown ${BINOWN} ${DESTDIR}/etc/sysctl.conf && \
chgrp ${BINGRP} ${DESTDIR}/etc/sysctl.conf && \
chmod 644 ${DESTDIR}/etc/sysctl.conf
cat sysctl.conf etc.${MACHINE}/sysctl.conf > \
${DESTDIR}/etc/examples/sysctl.conf && \
chown ${BINOWN} ${DESTDIR}/etc/examples/sysctl.conf && \
chgrp ${BINGRP} ${DESTDIR}/etc/examples/sysctl.conf && \
chmod 644 ${DESTDIR}/etc/examples/sysctl.conf
cat fbtab.head etc.${MACHINE}/fbtab fbtab.tail > ${DESTDIR}/etc/fbtab && \ cat fbtab.head etc.${MACHINE}/fbtab fbtab.tail > ${DESTDIR}/etc/fbtab && \
chown ${BINOWN} ${DESTDIR}/etc/fbtab && \ chown ${BINOWN} ${DESTDIR}/etc/fbtab && \
chgrp ${BINGRP} ${DESTDIR}/etc/fbtab && \ chgrp ${BINGRP} ${DESTDIR}/etc/fbtab && \


+ 2
- 2
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.93 2014/07/14 09:04:02 deraadt Exp $
# $OpenBSD: changelist,v 1.94 2014/07/15 08:28:43 deraadt Exp $
# #
# List of files which the security script backs up and checks # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -142,7 +142,7 @@
/etc/ssl/cert.pem /etc/ssl/cert.pem
/etc/sudoers /etc/sudoers
/etc/suid_profile /etc/suid_profile
/etc/sysctl.conf
+/etc/sysctl.conf
/etc/syslog.conf /etc/syslog.conf
/etc/sysmerge.ignore /etc/sysmerge.ignore
/etc/ttys /etc/ttys


src/etc/sysctl.conf → src/etc/examples/sysctl.conf View File

@ -1,4 +1,4 @@
# $OpenBSD: sysctl.conf,v 1.58 2014/07/11 16:43:07 henning Exp $
# $OpenBSD: sysctl.conf,v 1.1 2014/07/15 08:28:43 deraadt Exp $
# #
# This file contains a list of sysctl options the user wants set at # This file contains a list of sysctl options the user wants set at
# boot time. See sysctl(3) and sysctl(8) for more information on # boot time. See sysctl(3) and sysctl(8) for more information on

Loading…
Cancel
Save