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/librc/librc-depend.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/librc') 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); -- cgit v1.2.3