From 9f6e05671d6d48faa7b83aec05a637bcdfcb3f82 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 7 Dec 2015 17:56:02 -0600 Subject: Convert rc_sys() calls to detect_container() and detect_vm() --- src/rc/rc-misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/rc/rc-misc.c') diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c index 1e2af0ab..263c0eda 100644 --- a/src/rc/rc-misc.c +++ b/src/rc/rc-misc.c @@ -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 -- cgit v1.2.3