emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "librc: fix librc-depend functions to call rc_sys"

Browse Source 
This reverts commit 73482cf13a.
This commit is contained in:
William Hubbs 2016-01-18 23:40:03 -06:00
parent 79359f77cc
commit 6c09421375
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librc/librc-depend.c
View File

@ -740,7 +740,7 @@ rc_deptree_update(void)
char *depend, *depends, *service, *type, *nosys, *onosys; char *depend, *depends, *service, *type, *nosys, *onosys;
size_t i, k, l; size_t i, k, l;
bool retval = true; bool retval = true;
const char *sys = rc_sys(); const char *sys = NULL;
struct utsname uts; struct utsname uts;
/* Some init scripts need RC_LIBEXECDIR to source stuff /* 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 /* 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. */ * work for them. This doesn't stop them from being run directly. */
sys = detect_container();
if (!sys)
sys = detect_vm();
if (sys) { if (sys) {
len = strlen(sys); len = strlen(sys);
nosys = xmalloc(len + 2); nosys = xmalloc(len + 2);