mirror of
https://github.com/troglobit/finit.git
synced 2026-11-21 19:51:46 +00:00
Allow building Finit --without-rc-local support
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
4a2381eb6f
commit
612f5a9385
2 files changed
+6
-5
No files matched your search
+4
-5
@@ -234,10 +234,9 @@ AC_DEFINE_UNQUOTED(FINIT_RCSD, "$rcsd_path", [Finit rcS.d/, default /etc/finit.d
|
|||||||
AC_SUBST(FINIT_RCSD, "$rcsd_path")
|
AC_SUBST(FINIT_RCSD, "$rcsd_path")
|
||||||
|
|
||||||
AS_IF([test "x$with_rc_local" != "xno"], [
|
AS_IF([test "x$with_rc_local" != "xno"], [
|
||||||
AS_IF([test "x$rclocal" = "xyes"], [
|
AS_IF([test "x$rclocal" = "xyes"], [rclocal=$sysconfdir/rc.local])
|
||||||
rclocal=$sysconfdir/rc.local])])
|
AC_EXPAND_DIR(rclocal_path, "$rclocal")
|
||||||
AC_EXPAND_DIR(rclocal_path, "$rclocal")
|
AC_DEFINE_UNQUOTED(FINIT_RC_LOCAL, "$rclocal_path", [Compat SysV /etc/rc.local file to run last at boot.])])
|
||||||
AC_DEFINE_UNQUOTED(FINIT_RC_LOCAL, "$rclocal_path", [Compat SysV /etc/rc.local file to run last at boot.])
|
|
||||||
|
|
||||||
AS_IF([test "x$with_sysconfig" != "xno"], [
|
AS_IF([test "x$with_sysconfig" != "xno"], [
|
||||||
AS_IF([test "x$sysconfig" != "xdefault"], [
|
AS_IF([test "x$sysconfig" != "xdefault"], [
|
||||||
@@ -370,7 +369,7 @@ cat <<EOF
|
|||||||
Finit config file.....: $conf_path
|
Finit config file.....: $conf_path
|
||||||
Finit config.d path...: $rcsd_path
|
Finit config.d path...: $rcsd_path
|
||||||
Finit plugin path.....: $plugin_path
|
Finit plugin path.....: $plugin_path
|
||||||
Compat rc.local path..: $rclocal_path
|
Compat rc.local path..: `eval echo $rclocal`
|
||||||
System environment....: ${sysconfig_path:-${sysconfig}}
|
System environment....: ${sysconfig_path:-${sysconfig}}
|
||||||
Random seed path......: $random_path
|
Random seed path......: $random_path
|
||||||
C Compiler............: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS
|
C Compiler............: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS
|
||||||
|
|||||||
@@ -316,9 +316,11 @@ restart:
|
|||||||
/* Cleanup stale services */
|
/* Cleanup stale services */
|
||||||
svc_clean_dynamic(service_unregister);
|
svc_clean_dynamic(service_unregister);
|
||||||
|
|
||||||
|
#ifdef FINIT_RC_LOCAL
|
||||||
/* Compat SysV init */
|
/* Compat SysV init */
|
||||||
if (prevlevel == INIT_LEVEL && !rescue)
|
if (prevlevel == INIT_LEVEL && !rescue)
|
||||||
run_bg(FINIT_RC_LOCAL, NULL);
|
run_bg(FINIT_RC_LOCAL, NULL);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "I've seen things you people wouldn't believe. Attack ships on fire off
|
* "I've seen things you people wouldn't believe. Attack ships on fire off
|
||||||
|
|||||||
Reference in new issue
Block a user