0001-update-rc_sys-handling.patch

0001-update-rc_sys-handling.patch (text/plain), 4.61 KB, created by William Hubbs on 2011-03-14 12:11:06 UTC

From 4c19be4f9fc5dd6006c42d0bc49ec9ecbba5e495 Mon Sep 17 00:00:00 2001
From: William Hubbs <[e-mail]>
Date: Fri, 11 Mar 2011 16:11:10 -0600
Subject: [PATCH] update rc_sys handling

Improve the documentation for rc_sys in @sysconfdir@/rc.conf and make it
unset by default. This will allow the autodetection code to run which
will make it possible for those subsystems we can autodetect, such as
vserver guests, to be usable out of the box.

X-Gentoo-Bug: 357247
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=357247
---
 etc/Makefile        |    6 +++++-
 etc/rc.conf.FreeBSD |   10 +++++-----
 etc/rc.conf.Linux   |   11 ++++++-----
 etc/rc.conf.NetBSD  |   10 +++++-----
 mk/scripts.mk       |    2 +-
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 24e5455..64d0927 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -8,5 +8,9 @@ include ${MK}/os.mk
 include Makefile.${OS}
 include ${MK}/scripts.mk
 
+ifneq "${MKRCSYS}" ""
+SED_RC	=	-e 's:^\#rc_sys=":rc_sys="${MKRCSYS}:g'
+endif
+
 rc.conf: rc.conf.in rc.conf.${OS}
-	${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@
+	${SED} ${SED_REPLACE} ${SED_RC} ${SED_EXTRA} $^ > $@
diff --git a/etc/rc.conf.FreeBSD b/etc/rc.conf.FreeBSD
index ed5b215..c3b54ec 100644
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -2,10 +2,10 @@
 # ""        - nothing special
 # "jail"    - FreeBSD jails
 # "prefix"  - Prefix
-# If unset, the old automagic detection code will be triggered. Said old code
-# is deprecated and will be removed not later than 2011/03/01.
+# If this is commented out, automatic detection will be attempted.
+# Note that automatic detection does not work in a prefix environment.
 #
-# This should be set to the value representing what environment this file is
-# PRESENTLY in, not what virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+# 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=""
 
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index 9632a75..4169313 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -7,12 +7,13 @@
 # "vserver" - Linux vserver
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If unset, the old automagic detection code will be triggered. Said old code
-# is deprecated and will be removed not later than 2011/03/01.
+# If this is commented out, automatic detection will be attempted.
+# Note that autodetection will not work in a prefix environment or in a
+# linux container.
 #
-# This should be set to the value representing what environment this file is
-# PRESENTLY in, not what virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+# 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=""
 
 ##############################################################################
 # LINUX SPECIFIC OPTIONS
diff --git a/etc/rc.conf.NetBSD b/etc/rc.conf.NetBSD
index c49a9ab..0ed3083 100644
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -3,10 +3,10 @@
 # "prefix"  - Prefix
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If unset, the old automagic detection code will be triggered. Said old code
-# is deprecated and will be removed not later than 2011/03/01.
+# If this is commented out, automatic detection will be attempted.
+# Note that automatic detection does not work in a prefix environment.
 #
-# This should be set to the value representing what environment this file is
-# PRESENTLY in, not what virtualization the environment is capable of.
-rc_sys="@RC_SYS_DEFAULT@"
+# 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=""
 
diff --git a/mk/scripts.mk b/mk/scripts.mk
index c45fed1..3517aab 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -12,7 +12,7 @@ _PKG_SED:=		$(shell ${_PKG_SED_SH})
 _LCL_SED_SH=		if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
 _LCL_SED:=		$(shell ${_LCL_SED_SH})
 
-SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@RC_SYS_DEFAULT@:${MKRCSYS}:g' ${_PKG_SED} ${_LCL_SED}
+SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
 .SUFFIXES:	.sh.in .in
-- 
1.7.3.4