[patch] 20110304-allow-rc_sys_default.patch

20110304-allow-rc_sys_default.patch (text/plain), 2.06 KB, created by Robin Johnson on 2011-03-04 23:58:20 UTC

diff --git a/etc/rc.conf.FreeBSD b/etc/rc.conf.FreeBSD
index 800c6cf..139a825 100644
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -8,5 +8,5 @@
 # This should be set to the value representing what environment this file is
 # PRESENTLY in, not what virtualization the environment is capable of.
 # See the OpenRC migration guide for more details.
-rc_sys=""
+rc_sys="@RC_SYS_DEFAULT@"
 
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index b110a81..1400af5 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -13,7 +13,7 @@
 # This should be set to the value representing what environment this file is
 # PRESENTLY in, not what virtualization the environment is capable of.
 # See the OpenRC migration guide for more details.
-rc_sys=""
+rc_sys="@RC_SYS_DEFAULT@"
 
 ##############################################################################
 # LINUX SPECIFIC OPTIONS
diff --git a/etc/rc.conf.NetBSD b/etc/rc.conf.NetBSD
index b29000b..3528a00 100644
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -9,5 +9,5 @@
 # This should be set to the value representing what environment this file is
 # PRESENTLY in, not what virtualization the environment is capable of.
 # See the OpenRC migration guide for more details.
-rc_sys=""
+rc_sys="@RC_SYS_DEFAULT@"
 
diff --git a/mk/scripts.mk b/mk/scripts.mk
index 3517aab..0e29249 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' ${_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' -e -e 's:@RC_SYS_DEFAULT@:$(MKRCSYS):g' ${_PKG_SED} ${_LCL_SED}
 
 # Tweak our shell scripts
 .SUFFIXES:	.sh.in .in