head 1.7; access; symbols netbsd-10-0-RELEASE:1.7 netbsd-10-0-RC6:1.7 netbsd-10-0-RC5:1.7 netbsd-10-0-RC4:1.7 netbsd-10-0-RC3:1.7 netbsd-10-0-RC2:1.7 netbsd-10-0-RC1:1.7 netbsd-10:1.7.0.10 netbsd-10-base:1.7 netbsd-9-3-RELEASE:1.7 cjep_sun2x-base1:1.7 cjep_sun2x:1.7.0.8 cjep_sun2x-base:1.7 cjep_staticlib_x-base1:1.7 netbsd-9-2-RELEASE:1.7 cjep_staticlib_x:1.7.0.6 cjep_staticlib_x-base:1.7 netbsd-9-1-RELEASE:1.7 phil-wifi-20200421:1.7 phil-wifi-20200411:1.7 is-mlppp:1.7.0.4 is-mlppp-base:1.7 phil-wifi-20200406:1.7 netbsd-8-2-RELEASE:1.6 netbsd-9-0-RELEASE:1.7 netbsd-9-0-RC2:1.7 netbsd-9-0-RC1:1.7 phil-wifi-20191119:1.7 netbsd-9:1.7.0.2 netbsd-9-base:1.7 phil-wifi-20190609:1.7 netbsd-8-1-RELEASE:1.6 netbsd-8-1-RC1:1.6 pgoyette-compat-merge-20190127:1.6 pgoyette-compat-20190127:1.6 pgoyette-compat-20190118:1.6 pgoyette-compat-1226:1.6 pgoyette-compat-1126:1.6 pgoyette-compat-1020:1.6 pgoyette-compat-0930:1.6 pgoyette-compat-0906:1.6 netbsd-7-2-RELEASE:1.6 pgoyette-compat-0728:1.6 netbsd-8-0-RELEASE:1.6 phil-wifi:1.6.0.30 phil-wifi-base:1.6 pgoyette-compat-0625:1.6 netbsd-8-0-RC2:1.6 pgoyette-compat-0521:1.6 pgoyette-compat-0502:1.6 pgoyette-compat-0422:1.6 netbsd-8-0-RC1:1.6 pgoyette-compat-0415:1.6 pgoyette-compat-0407:1.6 pgoyette-compat-0330:1.6 pgoyette-compat-0322:1.6 pgoyette-compat-0315:1.6 netbsd-7-1-2-RELEASE:1.6 pgoyette-compat:1.6.0.28 pgoyette-compat-base:1.6 netbsd-7-1-1-RELEASE:1.6 matt-nb8-mediatek:1.6.0.26 matt-nb8-mediatek-base:1.6 perseant-stdc-iso10646:1.6.0.24 perseant-stdc-iso10646-base:1.6 netbsd-8:1.6.0.22 netbsd-8-base:1.6 prg-localcount2-base3:1.6 prg-localcount2-base2:1.6 prg-localcount2-base1:1.6 prg-localcount2:1.6.0.20 prg-localcount2-base:1.6 pgoyette-localcount-20170426:1.6 bouyer-socketcan-base1:1.6 pgoyette-localcount-20170320:1.6 netbsd-7-1:1.6.0.18 netbsd-7-1-RELEASE:1.6 netbsd-7-1-RC2:1.6 netbsd-7-nhusb-base-20170116:1.6 bouyer-socketcan:1.6.0.16 bouyer-socketcan-base:1.6 pgoyette-localcount-20170107:1.6 netbsd-7-1-RC1:1.6 pgoyette-localcount-20161104:1.6 netbsd-7-0-2-RELEASE:1.6 localcount-20160914:1.6 netbsd-7-nhusb:1.6.0.14 netbsd-7-nhusb-base:1.6 pgoyette-localcount-20160806:1.6 pgoyette-localcount-20160726:1.6 pgoyette-localcount:1.6.0.12 pgoyette-localcount-base:1.6 netbsd-7-0-1-RELEASE:1.6 netbsd-7-0:1.6.0.10 netbsd-7-0-RELEASE:1.6 netbsd-7-0-RC3:1.6 netbsd-7-0-RC2:1.6 netbsd-7-0-RC1:1.6 netbsd-5-2-3-RELEASE:1.3 netbsd-5-1-5-RELEASE:1.3 netbsd-6-0-6-RELEASE:1.5 netbsd-6-1-5-RELEASE:1.5 netbsd-7:1.6.0.8 netbsd-7-base:1.6 yamt-pagecache-base9:1.6 yamt-pagecache-tag8:1.5 netbsd-6-1-4-RELEASE:1.5 netbsd-6-0-5-RELEASE:1.5 tls-earlyentropy:1.6.0.6 tls-earlyentropy-base:1.6 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6 riastradh-drm2-base3:1.6 netbsd-6-1-3-RELEASE:1.5 netbsd-6-0-4-RELEASE:1.5 netbsd-5-2-2-RELEASE:1.3 netbsd-5-1-4-RELEASE:1.3 netbsd-6-1-2-RELEASE:1.5 netbsd-6-0-3-RELEASE:1.5 netbsd-5-2-1-RELEASE:1.3 netbsd-5-1-3-RELEASE:1.3 netbsd-6-1-1-RELEASE:1.5 riastradh-drm2-base2:1.6 riastradh-drm2-base1:1.6 riastradh-drm2:1.6.0.4 riastradh-drm2-base:1.6 netbsd-6-1:1.5.0.16 netbsd-6-0-2-RELEASE:1.5 netbsd-6-1-RELEASE:1.5 khorben-n900:1.6.0.2 netbsd-6-1-RC4:1.5 netbsd-6-1-RC3:1.5 agc-symver:1.5.0.14 agc-symver-base:1.5 netbsd-6-1-RC2:1.5 netbsd-6-1-RC1:1.5 yamt-pagecache-base8:1.5 netbsd-5-2:1.3.0.50 netbsd-6-0-1-RELEASE:1.5 yamt-pagecache-base7:1.5 netbsd-5-2-RELEASE:1.3 netbsd-5-2-RC1:1.3 matt-nb6-plus-nbase:1.5 yamt-pagecache-base6:1.5 netbsd-6-0:1.5.0.10 netbsd-6-0-RELEASE:1.5 netbsd-6-0-RC2:1.5 tls-maxphys:1.5.0.8 tls-maxphys-base:1.6 matt-nb6-plus:1.5.0.6 matt-nb6-plus-base:1.5 netbsd-6-0-RC1:1.5 yamt-pagecache-base5:1.5 yamt-pagecache-base4:1.5 netbsd-6:1.5.0.4 netbsd-6-base:1.5 netbsd-5-1-2-RELEASE:1.3 netbsd-5-1-1-RELEASE:1.3 yamt-pagecache-base3:1.5 yamt-pagecache-base2:1.5 yamt-pagecache:1.5.0.2 yamt-pagecache-base:1.5 cherry-xenmp:1.3.0.48 cherry-xenmp-base:1.3 bouyer-quota2-nbase:1.3 bouyer-quota2:1.3.0.46 bouyer-quota2-base:1.3 matt-mips64-premerge-20101231:1.3 matt-nb5-mips64-premerge-20101231:1.3 matt-nb5-pq3:1.3.0.44 matt-nb5-pq3-base:1.3 netbsd-5-1:1.3.0.42 netbsd-5-1-RELEASE:1.3 netbsd-5-1-RC4:1.3 matt-nb5-mips64-k15:1.3 netbsd-5-1-RC3:1.3 netbsd-5-1-RC2:1.3 netbsd-5-1-RC1:1.3 netbsd-5-0-2-RELEASE:1.3 matt-nb5-mips64-premerge-20091211:1.3 matt-premerge-20091211:1.3 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3 matt-nb4-mips64-k7-u2a-k9b:1.3 matt-nb5-mips64-u1-k1-k5:1.3 matt-nb5-mips64:1.3.0.40 netbsd-5-0-1-RELEASE:1.3 jym-xensuspend-nbase:1.3 netbsd-5-0:1.3.0.38 netbsd-5-0-RELEASE:1.3 netbsd-5-0-RC4:1.3 netbsd-5-0-RC3:1.3 netbsd-5-0-RC2:1.3 jym-xensuspend:1.3.0.36 jym-xensuspend-base:1.3 netbsd-5-0-RC1:1.3 mjf-devfs2-base2:1.3 netbsd-5:1.3.0.34 netbsd-5-base:1.3 matt-mips64-base2:1.3 matt-mips64:1.3.0.32 netbsd-4-0-1-RELEASE:1.3 wrstuden-revivesa-base-3:1.3 wrstuden-revivesa-base-2:1.3 wrstuden-fixsa-newbase:1.3 wrstuden-revivesa-base-1:1.3 yamt-pf42-base4:1.3 yamt-pf42-base3:1.3 hpcarm-cleanup-nbase:1.3 yamt-pf42-baseX:1.3 yamt-pf42-base2:1.3 wrstuden-revivesa:1.3.0.30 wrstuden-revivesa-base:1.3 yamt-pf42:1.3.0.28 yamt-pf42-base:1.3 mjf-devfs2:1.3.0.26 mjf-devfs2-base:1.3 keiichi-mipv6:1.3.0.24 keiichi-mipv6-base:1.3 mjf-devfs:1.3.0.22 mjf-devfs-base:1.3 matt-armv6-nbase:1.3 matt-armv6-prevmlocking:1.3 wrstuden-fixsa-base-1:1.3 netbsd-4-0:1.3.0.20 netbsd-4-0-RELEASE:1.3 cube-autoconf:1.3.0.18 cube-autoconf-base:1.3 netbsd-4-0-RC5:1.3 netbsd-4-0-RC4:1.3 netbsd-4-0-RC3:1.3 netbsd-4-0-RC2:1.3 netbsd-4-0-RC1:1.3 matt-armv6:1.3.0.16 matt-armv6-base:1.3 matt-mips64-base:1.3 hpcarm-cleanup:1.3.0.14 hpcarm-cleanup-base:1.3 netbsd-3-1-1-RELEASE:1.3 netbsd-3-0-3-RELEASE:1.3 wrstuden-fixsa:1.3.0.12 wrstuden-fixsa-base:1.3 abandoned-netbsd-4-base:1.3 abandoned-netbsd-4:1.3.0.6 netbsd-3-1:1.3.0.8 netbsd-3-1-RELEASE:1.3 netbsd-3-0-2-RELEASE:1.3 netbsd-3-1-RC4:1.3 netbsd-3-1-RC3:1.3 netbsd-3-1-RC2:1.3 netbsd-3-1-RC1:1.3 netbsd-4:1.3.0.10 netbsd-4-base:1.3 netbsd-3-0-1-RELEASE:1.3 netbsd-3-0:1.3.0.4 netbsd-3-0-RELEASE:1.3 netbsd-3-0-RC6:1.3 netbsd-3-0-RC5:1.3 netbsd-3-0-RC4:1.3 netbsd-3-0-RC3:1.3 netbsd-3-0-RC2:1.3 netbsd-3-0-RC1:1.3 netbsd-2-0-3-RELEASE:1.2 netbsd-2-1:1.2.0.8 netbsd-2-1-RELEASE:1.2 netbsd-2-1-RC6:1.2 netbsd-2-1-RC5:1.2 netbsd-2-1-RC4:1.2 netbsd-2-1-RC3:1.2 netbsd-2-1-RC2:1.2 netbsd-2-1-RC1:1.2 netbsd-2-0-2-RELEASE:1.2 netbsd-3:1.3.0.2 netbsd-3-base:1.3 netbsd-2-0-1-RELEASE:1.2 netbsd-2:1.2.0.6 netbsd-2-base:1.2 netbsd-2-0-RELEASE:1.2 netbsd-2-0-RC5:1.2 netbsd-2-0-RC4:1.2 netbsd-2-0-RC3:1.2 netbsd-2-0-RC2:1.2 netbsd-2-0-RC1:1.2 netbsd-2-0:1.2.0.4 netbsd-2-0-base:1.2 netbsd-1-6-PATCH002-RELEASE:1.2 netbsd-1-6-PATCH002:1.2 netbsd-1-6-PATCH002-RC4:1.2 netbsd-1-6-PATCH002-RC3:1.2 netbsd-1-6-PATCH002-RC2:1.2 netbsd-1-6-PATCH002-RC1:1.2 netbsd-1-6-PATCH001:1.2 netbsd-1-6-PATCH001-RELEASE:1.2 netbsd-1-6-PATCH001-RC3:1.2 netbsd-1-6-PATCH001-RC2:1.2 netbsd-1-6-PATCH001-RC1:1.2 fvdl_fs64_base:1.2 netbsd-1-6-RELEASE:1.2 netbsd-1-6-RC3:1.2 netbsd-1-6-RC2:1.2 netbsd-1-6-RC1:1.2 netbsd-1-6:1.2.0.2 netbsd-1-6-base:1.2 netbsd-1-5-PATCH003:1.1.2.2 netbsd-1-5-PATCH002:1.1.2.2 netbsd-1-5-PATCH001:1.1.2.2 netbsd-1-5-RELEASE:1.1.2.2 netbsd-1-5-BETA2:1.1.2.2 netbsd-1-5-BETA:1.1.2.2 netbsd-1-5:1.1.0.2; locks; strict; comment @# @; 1.7 date 2019.04.10.00.32.15; author sevan; state Exp; branches; next 1.6; commitid S4rVKjHsyVb7IJiB; 1.6 date 2013.05.01.05.36.25; author agc; state Exp; branches 1.6.30.1; next 1.5; 1.5 date 2011.08.22.20.48.38; author jym; state Exp; branches 1.5.2.1 1.5.8.1; next 1.4; 1.4 date 2011.08.22.18.54.06; author jym; state Exp; branches; next 1.3; 1.3 date 2004.05.16.09.53.09; author lukem; state Exp; branches; next 1.2; 1.2 date 2002.04.24.08.18.45; author lukem; state Exp; branches; next 1.1; 1.1 date 2000.10.01.05.46.03; author lukem; state Exp; branches 1.1.2.1; next ; 1.6.30.1 date 2019.06.10.21.42.40; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.5.2.1 date 2014.05.22.11.27.19; author yamt; state Exp; branches; next ; commitid spVi6gj5ReXSGwBx; 1.5.8.1 date 2013.06.23.06.26.21; author tls; state Exp; branches; next ; commitid OnlO1cBgtQRcIHUw; 1.1.2.1 date 2000.10.01.05.46.03; author lukem; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2000.10.02.03.13.01; author lukem; state Exp; branches; next ; desc @@ 1.7 log @Include npf_boot rc.d scripts which loads an interim config early in boot. By default /etc/default/npf.boot.conf which can be overriden by /etc/npf.boot.conf. @ text @# $NetBSD: Makefile,v 1.6 2013/05/01 05:36:25 agc Exp $ .include CONFIGFILES= daily.conf monthly.conf npf.boot.conf pkgpath.conf \ security.conf weekly.conf FILESDIR= /etc/defaults FILESMODE= ${NONBINMODE} # Manage arch-specific rc.conf(5) file CONFIGFILES+= rc_conf FILESNAME_rc_conf= rc.conf FILESBUILD_rc_conf= yes # If present, rc.conf.append is added to the end of the default rc.conf file RCCONF_SRCS= ${.CURDIR}/rc.conf .if exists(../etc.${MACHINE}/rc.conf.append) RCCONF_SRCS+= ${.CURDIR}/../etc.${MACHINE}/rc.conf.append .endif rc_conf: ${RCCONF_SRCS} ${_MKTARGET_CREATE} ${TOOL_CAT} ${RCCONF_SRCS} > ${.TARGET} .include @ 1.6 log @Fix for problematic paths in /etc/daily and /etc/security reported in PR/47645. Add a separate file which contains the paths for the pkg_admin and pkg_info utilities. This is called /etc/pkgpath.conf (to distinguish it from pkg.conf). Thanks also to Edgar Fuss for the sanity check. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2011/08/22 20:48:38 jym Exp $ d5 2 a6 1 CONFIGFILES= daily.conf monthly.conf pkgpath.conf security.conf weekly.conf @ 1.6.30.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2019/04/10 00:32:15 sevan Exp $ d5 1 a5 2 CONFIGFILES= daily.conf monthly.conf npf.boot.conf pkgpath.conf \ security.conf weekly.conf @ 1.5 log @Arch-specific rc.conf files are not really autonomous rc.conf files, they are appended to the end of etc/defaults/rc.conf. So rename them to rc.conf.append for clarity, as suggested by mrg@@. Adapt Makefile accordingly. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2011/08/22 18:54:06 jym Exp $ d5 1 a5 1 CONFIGFILES= daily.conf monthly.conf security.conf weekly.conf @ 1.5.2.1 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2011/08/22 20:48:38 jym Exp $ d5 1 a5 1 CONFIGFILES= daily.conf monthly.conf pkgpath.conf security.conf weekly.conf @ 1.5.8.1 log @resync from head @ text @d1 1 a1 1 # $NetBSD$ d5 1 a5 1 CONFIGFILES= daily.conf monthly.conf pkgpath.conf security.conf weekly.conf @ 1.4 log @Modify etc/defaults/Makefile so that architectures can specify an additional rc.conf file. This one should reside under etc/etc.${MACHINE}/, and will get automatically appended to etc/defaults/rc.conf at build time if present. This is used by i386 and amd64 to append a small MD rc.conf(5) configuration at the end of the defaults/rc.conf file, so that powerd(8) can be started by default when we are running in a Xen environment. This is needed to support save/restore functions for domains. From all the alternatives proposed to fix that issue (from /etc/rc.conf parsing in postinstall to etc/defaults/rc.conf arch-hooks) I believe this one will appease everyone because it: - does not touch etc/defaults/rc.conf template file, - patches it at build time for MD hooks only when required, - does not need to parse/modify a user-specified file like /etc/rc.conf (which is a complex, error-prone operation), - only enables powerd(8) by default when conditions are met (Xen environment) while still allowing root to shoot himself in the foot if he wants to override this manually in /etc/rc.conf. See also http://mail-index.netbsd.org/tech-userlevel/2011/07/25/msg005246.html @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2004/05/16 09:53:09 lukem Exp $ d14 1 d16 2 a17 2 .if exists(../etc.${MACHINE}/rc.conf) RCCONF_SRCS+= ${.CURDIR}/../etc.${MACHINE}/rc.conf @ 1.3 log @Consistently use CONFIGFILES & CONFIGLINKS (which enable the 'configinstall' target) instead of using home-grown 'distribution' targets or using FILES with the 'install' target. Add some etc/ subdir Makefiles where appropriate. XXX: some of etc/Makefile install-etc-files could be converted to CONFIGFILES. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2002/04/24 08:18:45 lukem Exp $ d3 3 a5 1 CONFIGFILES= daily.conf monthly.conf rc.conf security.conf weekly.conf d9 14 @ 1.2 log @- in , don't clear FILES after using it, as that prevents make -V FILES from being useful (and given that every other variable can be extracted using make -V, the behaviour was unusually inconsistent given that the original reason for clearing it doesn't seem to be relevant anymore) - use instead of directly including (and possibly or ) - remove obsolete NOPROG @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2000/10/01 05:46:03 lukem Exp $ d3 1 a3 1 FILES= daily.conf monthly.conf rc.conf security.conf weekly.conf @ 1.1 log @move default config files from /etc/default -> /etc/defaults, to be consistent with what FreeBSD uses /etc/defaults for and since SVR4 uses /etc/default for another purpose. as discussed on tech-userlevel, and no objections were made. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2000/08/21 23:00:26 lukem Exp $ a5 2 NOPROG= noprog @ 1.1.2.1 log @file Makefile was added on branch netbsd-1-5 on 2000-10-02 03:13:01 +0000 @ text @d1 9 @ 1.1.2.2 log @pull up rev 1.1 (approved by thorpej): move default config files from /etc/default -> /etc/defaults, to be consistent with what FreeBSD uses /etc/defaults for, and since SVR4 uses /etc/default for another purpose. as discussed on tech-userlevel, and no objections were made. @ text @a0 9 # $NetBSD: Makefile,v 1.1.2.1 2000/10/02 03:13:01 lukem Exp $ FILES= daily.conf monthly.conf rc.conf security.conf weekly.conf FILESDIR= /etc/defaults FILESMODE= ${NONBINMODE} NOPROG= noprog .include @