diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-04-07 15:39:28 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-04-07 15:39:28 +0200 |
commit | 061978fa4d10851d18786432688a32984732c376 (patch) | |
tree | 6dcdb48308be6c02d87a8206a5ca101c533b71ee | |
parent | c16c534dcb35f88439e31d0f21a415bf43fb40f7 (diff) |
build-sys: fix build regarding SYSTEM_SYSVRCND_PATH
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | service.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index fd5dede5e0..f63b3e4f8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ AM_CPPFLAGS = \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \ -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ - -DSYSTEM_RCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ + -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \ -DSESSION_DATA_UNIT_PATH=\"$(pkgdatadir)/session\" \ -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" @@ -45,7 +45,6 @@ static const char * const rcnd_table[] = { "/rc6.d", SPECIAL_RUNLEVEL6_TARGET }; - static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, [SERVICE_START_PRE] = UNIT_ACTIVATING, @@ -218,7 +217,7 @@ static int priority_from_rcd(Service *s, const char *init_script) { char **p; unsigned i; - STRV_FOREACH(p, UNIT(s)->meta.manager->sysrcnd_path) + STRV_FOREACH(p, UNIT(s)->meta.manager->sysvrcnd_path) for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) { char *path; DIR *d; |