aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-01-25 13:06:55 -0600
committerWilliam Hubbs <williamh@gentoo.org>2012-02-20 20:13:11 -0600
commit32c506a4c813b77f9cad4051409bac15f9696e14 (patch)
treed5c8ec1fd7b74cbd4ca16e9e01e3c09df8434b74 /etc
parent04db6c3d39f1c2e81e7d6d98f17388e2003bc17f (diff)
Drop rc_sys definition from build system
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile9
-rw-r--r--etc/rc.conf.FreeBSD2
-rw-r--r--etc/rc.conf.Linux2
-rw-r--r--etc/rc.conf.NetBSD2
4 files changed, 3 insertions, 12 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 8bcf19ba..53bf47cc 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -24,14 +24,5 @@ SED_EXTRA= ${SED_EXTRA-${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} $^ > $@
diff --git a/etc/rc.conf.FreeBSD b/etc/rc.conf.FreeBSD
index d557213a..d2b6d948 100644
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -10,5 +10,5 @@
#
# This should be set to the value representing the environment this file is
# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index e88fc538..d79165d8 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -16,7 +16,7 @@
#
# This should be set to the value representing the environment this file is
# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""
# This is the number of tty's used in most of the rc-scripts (like
# consolefont, numlock, etc ...)
diff --git a/etc/rc.conf.NetBSD b/etc/rc.conf.NetBSD
index 864aa55e..af7adf67 100644
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -11,5 +11,5 @@
#
# This should be set to the value representing the environment this file is
# PRESENTLY in, not the virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+#rc_sys=""