[gentoo-commits] proj/openrc:master commit in: etc/

["William Hubbs" <williamh@gentoo.org>]

commit:     d7e48fe643bc82ae6280193dc42f5fef7265abac
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 01:24:28 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 01:35:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d7e48fe6

rc_sys: let default behavior be automagic

The default rc_sys behavior was changed to always require manual
intervention by users.  This pretty much breaks all of the diff
system variants out there if people don't explicitly edit their
rc.conf file ahead of time.  We should have things work "out of
the box" as much as possible and reasonable.

X-Gentoo-Bug: 357247
X-Gentoo-Bug-URL: http://bugs.gentoo.org/357247
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 etc/Makefile |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 24e5455..314225a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -8,5 +8,14 @@ include ${MK}/os.mk
 include Makefile.${OS}
 include ${MK}/scripts.mk
 
+# We can't use "ifndef" here because that treats set-but-empty
+# as not-set which is not what we want
+MKRCSYS ?= automagicplease
+ifeq ($(MKRCSYS),automagicplease)
+# If the user isn't picking a default, then have the
+# config go with runtime automagic detection #357247
+rc.conf: SED_EXTRA += -e '/^rc_sys=""/s:^:\#:'
+MKRCSYS =
+endif
 rc.conf: rc.conf.in rc.conf.${OS}
 	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@