Module Name: src
Committed By: jym
Date: Mon Aug 22 18:54:06 UTC 2011
Modified Files:
src/etc: Makefile
src/etc/defaults: Makefile rc.conf
Added Files:
src/etc/etc.amd64: rc.conf
src/etc/etc.i386: rc.conf
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.391 -r1.392 src/etc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/etc/defaults/Makefile
cvs rdiff -u -r1.113 -r1.114 src/etc/defaults/rc.conf
cvs rdiff -u -r0 -r1.1 src/etc/etc.amd64/rc.conf
cvs rdiff -u -r0 -r1.1 src/etc/etc.i386/rc.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
