Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Arch-specific rc.conf files are not really autonomous rc.conf

Browse Source 
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.
This commit is contained in:
jym 2011-08-22 20:48:38 +00:00
parent f56903492e
commit cec3d05bda
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/defaults/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2011/08/22 18:54:06 jym Exp $
# $NetBSD: Makefile,v 1.5 2011/08/22 20:48:38 jym Exp $
.include <bsd.own.mk>
@ -11,9 +11,10 @@ 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)
RCCONF_SRCS+= ${.CURDIR}/../etc.${MACHINE}/rc.conf
.if exists(../etc.${MACHINE}/rc.conf.append)
RCCONF_SRCS+= ${.CURDIR}/../etc.${MACHINE}/rc.conf.append
.endif
rc_conf: ${RCCONF_SRCS}

2
etc/etc.amd64/rc.conf → etc/etc.amd64/rc.conf.append
View File

@ -1,4 +1,4 @@
# $NetBSD: rc.conf,v 1.1 2011/08/22 18:54:06 jym Exp $
# $NetBSD: rc.conf.append,v 1.1 2011/08/22 20:48:39 jym Exp $
#
# Arch-specific rc.conf(5) configuration.

2
etc/etc.i386/rc.conf → etc/etc.i386/rc.conf.append
View File

@ -1,4 +1,4 @@
# $NetBSD: rc.conf,v 1.1 2011/08/22 18:54:06 jym Exp $
# $NetBSD: rc.conf.append,v 1.1 2011/08/22 20:48:39 jym Exp $
#
# Arch-specific rc.conf(5) configuration.