[src/trunk]: src/etc Arch-specific rc.conf files are not really autonomous rc...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e3909959130
branches:  trunk
changeset: 768609:5e3909959130
user:      jym <jym%NetBSD.org@localhost>
date:      Mon Aug 22 20:48:38 2011 +0000

description:
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.

diffstat:

 etc/defaults/Makefile        |  7 ++++---
 etc/etc.amd64/rc.conf        |  9 ---------
 etc/etc.amd64/rc.conf.append |  9 +++++++++
 etc/etc.i386/rc.conf         |  9 ---------
 etc/etc.i386/rc.conf.append  |  9 +++++++++
 5 files changed, 22 insertions(+), 21 deletions(-)

diffs (74 lines):

diff -r 24a78a2f0449 -r 5e3909959130 etc/defaults/Makefile
--- a/etc/defaults/Makefile     Mon Aug 22 18:54:05 2011 +0000
+++ b/etc/defaults/Makefile     Mon Aug 22 20:48:38 2011 +0000
@@ -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 @@
 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}
diff -r 24a78a2f0449 -r 5e3909959130 etc/etc.amd64/rc.conf
--- a/etc/etc.amd64/rc.conf     Mon Aug 22 18:54:05 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#      $NetBSD: rc.conf,v 1.1 2011/08/22 18:54:06 jym Exp $
-#
-# Arch-specific rc.conf(5) configuration.
-
-# powerd(8) is required under Xen to manage save/restore events.
-#
-if /sbin/sysctl -q machdep.xen; then
-       powerd=YES
-fi
diff -r 24a78a2f0449 -r 5e3909959130 etc/etc.amd64/rc.conf.append
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/etc.amd64/rc.conf.append      Mon Aug 22 20:48:38 2011 +0000
@@ -0,0 +1,9 @@
+#      $NetBSD: rc.conf.append,v 1.1 2011/08/22 20:48:39 jym Exp $
+#
+# Arch-specific rc.conf(5) configuration.
+
+# powerd(8) is required under Xen to manage save/restore events.
+#
+if /sbin/sysctl -q machdep.xen; then
+       powerd=YES
+fi
diff -r 24a78a2f0449 -r 5e3909959130 etc/etc.i386/rc.conf
--- a/etc/etc.i386/rc.conf      Mon Aug 22 18:54:05 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#      $NetBSD: rc.conf,v 1.1 2011/08/22 18:54:06 jym Exp $
-#
-# Arch-specific rc.conf(5) configuration.
-
-# powerd(8) is required under Xen to manage save/restore events.
-#
-if /sbin/sysctl -q machdep.xen; then
-       powerd=YES
-fi
diff -r 24a78a2f0449 -r 5e3909959130 etc/etc.i386/rc.conf.append
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/etc.i386/rc.conf.append       Mon Aug 22 20:48:38 2011 +0000
@@ -0,0 +1,9 @@
+#      $NetBSD: rc.conf.append,v 1.1 2011/08/22 20:48:39 jym Exp $
+#
+# Arch-specific rc.conf(5) configuration.
+
+# powerd(8) is required under Xen to manage save/restore events.
+#
+if /sbin/sysctl -q machdep.xen; then
+       powerd=YES
+fi