diff options
| author | Doug Freed <dwfreed@mtu.edu> | 2016-01-17 21:43:46 -0800 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2016-01-19 00:09:20 -0600 |
| commit | 649f63d882d53533ae8b1c3b28967e772e738c45 (patch) | |
| tree | 3da01483f3fd5da6190116ecf4862f291bb7b1be /src/librc/librc-depend.c | |
| parent | 55a28f5d2524615560698453a5a6afd50460030c (diff) | |
librc: move system detection code into rc_sys and use it
This fixes an issue where librc code was calling code that only existed
in the rc binary.
This reverts commits 8addd79 and 9f6e056
This fixes #75.
Diffstat (limited to 'src/librc/librc-depend.c')
| -rw-r--r-- | src/librc/librc-depend.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index 991a871f..d64b2b2a 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 = NULL; + const char *sys = rc_sys(); struct utsname uts; /* Some init scripts need RC_LIBEXECDIR to source stuff @@ -847,9 +847,6 @@ 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); |