rc-default.patch

rc-default.patch (text/plain), 1.52 KB, created by William Hubbs on 2011-03-04 20:58:52 UTC

diff --git a/README b/README
index 2a2eac3..f8006d0 100644
--- a/README
+++ b/README
@@ -12,6 +12,7 @@ LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
 MKPAM=pam
 MKPKGCONFIG=no
+MKRCSYS=prefix
 MKSELINUX=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
diff --git a/src/librc/Makefile b/src/librc/Makefile
index 574aa2a..7fff92b 100644
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -19,6 +19,7 @@ SED_CMD=	-e 's:@PREFIX@:${PREFIX}:g'
 SED_CMD+=	-e 's:@LIB@:${LIBNAME}:g'
 SED_CMD+=	-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
 SED_CMD+=	-e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
+SED_CMD+=	-e 's:@RC_SYS_DEFAULT@:$(MKRCSYS):g'
 
 _PKG_PREFIX=	-e 's:.*@PKG_PREFIX@.*:\#undef RC_PKG_PREFIX:g'
 ifneq (${PKG_PREFIX},)
diff --git a/src/librc/librc.c b/src/librc/librc.c
index e134547..2d5a747 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -238,7 +238,10 @@ rc_sys_v2(void)
 #undef __STRING_SWITCH
 #undef __STRING_CASE
 #undef __STRING_SWITCH_END
-	return NULL;
+	if (strlen(RC_SYS_DEFAULT))
+		return RC_SYS_DEFAULT;
+	else
+		return NULL;
 }
 librc_hidden_def(rc_sys_v2)
 
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index 5b06de2..b63fce1 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -42,6 +42,7 @@ __BEGIN_DECLS
 #define RC_INITDIR              RC_SYSCONFDIR "/init.d"
 #define RC_CONFDIR              RC_SYSCONFDIR "/conf.d"
 #define RC_PLUGINDIR            RC_LIBDIR "/plugins"
+#define RC_SYS_DEFAULT "@RC_SYS_DEFAULT@"
 
 #define RC_PROFILE_ENV     RC_SYSCONFDIR "/profile.env"
 #define RC_SYS_WHITELIST   RC_LIBEXECDIR "/conf.d/env_whitelist"