summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-10 20:24:28 -0500
committerWilliam Hubbs <williamh@gentoo.org>2011-03-14 20:35:08 -0500
commitd7e48fe643bc82ae6280193dc42f5fef7265abac (patch)
treeabd20669df8ef857c73ef40f5b2b5b737a1f6afc
parent87302487d20bda52735031bf8f53fa57c2e33a03 (diff)
downloadopenrc-d7e48fe643bc82ae6280193dc42f5fef7265abac.tar.gz
openrc-d7e48fe643bc82ae6280193dc42f5fef7265abac.tar.bz2
openrc-d7e48fe643bc82ae6280193dc42f5fef7265abac.tar.xz
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@gentoo.org>
-rw-r--r--etc/Makefile9
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} $^ > $@