aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2016-01-18 23:40:03 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2016-01-18 23:40:03 -0600
commit6c0942137572608d02eb4b34bad55c9bf418a6ba (patch)
treed0049b62db9da9709e63a07773827454afc66719
parent79359f77cc786e18695368bccb6b6186ecfe38c0 (diff)
Revert "librc: fix librc-depend functions to call rc_sys"
This reverts commit 73482cf13a338051606788957cbd0031ac850c70.
-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 d64b2b2a..991a871f 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -740,7 +740,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
@@ -847,6 +847,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);