emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure old rc_sys code never runs if the rc_sys variable exists.

Browse Source 
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Robin H. Johnson 2011-01-05 22:33:03 -08:00
parent 6a0812645a
commit 647df8cfe7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librc/librc.c
View File

@ -290,9 +290,11 @@ librc_hidden_def(rc_sys_v1)
const char * const char *
rc_sys(void) rc_sys(void)
{ {
const char *s = rc_sys_v2(); if(rc_conf_value("rc_sys")) {
if(s) return s; return rc_sys_v2();
return rc_sys_v1(); } else {
return rc_sys_v1();
}
} }
librc_hidden_def(rc_sys) librc_hidden_def(rc_sys)