summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac10
-rw-r--r--src/systemctl/systemctl.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 79a4ec4521..f1bf7582fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -683,6 +683,16 @@ AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont])
AC_SUBST(KBD_LOADKEYS)
AC_SUBST(KBD_SETFONT)
+AC_ARG_WITH(telinit,
+ AS_HELP_STRING([--with-telinit=PATH],
+ [Path to telinit]),
+ [TELINIT="$withval"],
+ [TELINIT="/lib/upstart/telinit"])
+
+AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
+
+AC_SUBST(TELINIT)
+
# ------------------------------------------------------------------------------
have_myhostname=no
AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 1ea0e4e7ec..edd136addd 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4918,7 +4918,7 @@ static int parse_argv(int argc, char *argv[]) {
* request to it. For now we simply
* guess that it is Upstart. */
- execv("/lib/upstart/telinit", argv);
+ execv(TELINIT, argv);
log_error("Couldn't find an alternative telinit implementation to spawn.");
return -EIO;