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

Convert rc_sys() calls to detect_container() and detect_vm()

Browse Source
This commit is contained in:
William Hubbs
2015-12-07 17:56:02 -06:00
parent 8addd7913a
commit 9f6e05671d
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rc/rc-misc.c
View File

@ -139,7 +139,7 @@ env_config(void)
char *np;
char *npp;
char *tok;
const char *sys = rc_sys();
const char *sys = NULL;
char buffer[PATH_MAX];
/* Ensure our PATH is prefixed with the system locations first
@ -190,7 +190,9 @@ env_config(void)
} else
setenv("RC_DEFAULTLEVEL", RC_LEVEL_DEFAULT, 1);
if (sys)
sys = detect_container();
if (!sys)
sys = detect_vm();
setenv("RC_SYS", sys, 1);
#ifdef PREFIX