add --with-telinit=PATH configure option
Distributions that never shipped upstart do not have "telinit" in /lib/upstart/.. Defaults to /lib/upstart/telinit so there is no change for systems existing installs.
This commit is contained in:
parent
3ac251b81a
commit
4ad61fd180
10
configure.ac
10
configure.ac
|
@ -683,6 +683,16 @@ AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont])
|
||||||
AC_SUBST(KBD_LOADKEYS)
|
AC_SUBST(KBD_LOADKEYS)
|
||||||
AC_SUBST(KBD_SETFONT)
|
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
|
have_myhostname=no
|
||||||
AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
|
AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
|
||||||
|
|
|
@ -4918,7 +4918,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||||
* request to it. For now we simply
|
* request to it. For now we simply
|
||||||
* guess that it is Upstart. */
|
* guess that it is Upstart. */
|
||||||
|
|
||||||
execv("/lib/upstart/telinit", argv);
|
execv(TELINIT, argv);
|
||||||
|
|
||||||
log_error("Couldn't find an alternative telinit implementation to spawn.");
|
log_error("Couldn't find an alternative telinit implementation to spawn.");
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
Loading…
Reference in New Issue