Module Name: src
Committed By: jym
Date: Mon Aug 22 20:48:39 UTC 2011
Modified Files:
src/etc/defaults: Makefile
Added Files:
src/etc/etc.amd64: rc.conf.append
src/etc/etc.i386: rc.conf.append
Removed Files:
src/etc/etc.amd64: rc.conf
src/etc/etc.i386: rc.conf
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/etc/defaults/Makefile
cvs rdiff -u -r1.1 -r0 src/etc/etc.amd64/rc.conf
cvs rdiff -u -r0 -r1.1 src/etc/etc.amd64/rc.conf.append
cvs rdiff -u -r1.1 -r0 src/etc/etc.i386/rc.conf
cvs rdiff -u -r0 -r1.1 src/etc/etc.i386/rc.conf.append
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/Makefile
diff -u src/etc/defaults/Makefile:1.4 src/etc/defaults/Makefile:1.5
--- src/etc/defaults/Makefile:1.4 Mon Aug 22 18:54:06 2011
+++ src/etc/defaults/Makefile Mon Aug 22 20:48:38 2011
@@ -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}
Added files:
Index: src/etc/etc.amd64/rc.conf.append
diff -u /dev/null src/etc/etc.amd64/rc.conf.append:1.1
--- /dev/null Mon Aug 22 20:48:39 2011
+++ src/etc/etc.amd64/rc.conf.append Mon Aug 22 20:48:39 2011
@@ -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
Index: src/etc/etc.i386/rc.conf.append
diff -u /dev/null src/etc/etc.i386/rc.conf.append:1.1
--- /dev/null Mon Aug 22 20:48:39 2011
+++ src/etc/etc.i386/rc.conf.append Mon Aug 22 20:48:39 2011
@@ -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
