From 32c506a4c813b77f9cad4051409bac15f9696e14 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 25 Jan 2012 13:06:55 -0600 Subject: Drop rc_sys definition from build system --- etc/Makefile | 9 --------- etc/rc.conf.FreeBSD | 2 +- etc/rc.conf.Linux | 2 +- etc/rc.conf.NetBSD | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) (limited to 'etc') diff --git a/etc/Makefile b/etc/Makefile index 8bcf19b..53bf47c 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 d557213..d2b6d94 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 e88fc53..d79165d 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 864aa55..af7adf6 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="" -- cgit v1.2.3