build-sys: fix build regarding SYSTEM_SYSVRCND_PATH

diff --git a/Makefile.am b/Makefile.am
index fd5dede5e0420e8481c039c5009873726aecbde3..f63b3e4f8fec52bb6d7a680525af0a7c9debe49e 100644 (file)
--- 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\"

diff --git a/service.c b/service.c
index 23f8592b9bfde417c528041390cb2a37d4d9d597..865f84128c69d68c96815ff840f483acaf489b74 100644 (file)
--- a/service.c
+++ b/service.c
@@ -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;