aboutsummaryrefslogtreecommitdiff
path: root/src/librc
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2015-12-07 17:56:02 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2015-12-08 12:09:33 -0600
commit9f6e05671d6d48faa7b83aec05a637bcdfcb3f82 (patch)
tree9bd6a120ddac1c57eda065dac7d98e6280ec8996 /src/librc
parent8addd7913a743b75ef3854ab4a96fea81cc5245d (diff)
Convert rc_sys() calls to detect_container() and detect_vm()
Diffstat (limited to 'src/librc')
-rw-r--r--src/librc/librc-depend.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index c9c06ad1..14cf2979 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -753,7 +753,7 @@ rc_deptree_update(void)
char *depend, *depends, *service, *type, *nosys, *onosys;
size_t i, k, l;
bool retval = true;
- const char *sys = rc_sys();
+ const char *sys = NULL;
struct utsname uts;
/* Some init scripts need RC_LIBEXECDIR to source stuff
@@ -860,6 +860,9 @@ rc_deptree_update(void)
/* Phase 2 - if we're a special system, remove services that don't
* work for them. This doesn't stop them from being run directly. */
+ sys = detect_container();
+ if (!sys)
+ sys = detect_vm();
if (sys) {
len = strlen(sys);
nosys = xmalloc(len + 2);