diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:14:20 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:14:20 +0200 |
| commit | f25b623eb0a6543630c876af7b87885a62edc1a6 (patch) | |
| tree | 7f3a85434941cb53106c3327c9810699e2f42bcd | |
| parent | 11daed7de4fdadb3ca98ec8a6ef9080e66fe56fc (diff) | |
Remove rc.local checks
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 21 |
2 files changed, 0 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 8e518b3be1..cd9ed60a9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -995,8 +995,6 @@ substitutions = \ '|MKDIR_P=$(MKDIR_P)|' \ '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \ '|VARLOGDIR=$(varlogdir)|' \ - '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ - '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ diff --git a/configure.ac b/configure.ac index de36102070..2eef62fa32 100644 --- a/configure.ac +++ b/configure.ac @@ -525,25 +525,6 @@ fi AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"]) # ------------------------------------------------------------------------------ -AC_ARG_WITH(rc-local-script-path-start, - AS_HELP_STRING([--with-rc-local-script-path-start=PATH], - [Path to /etc/rc.local]), - [RC_LOCAL_SCRIPT_PATH_START="$withval"], - [RC_LOCAL_SCRIPT_PATH_START="/etc/rc.local"]) - -AC_ARG_WITH(rc-local-script-path-stop, - AS_HELP_STRING([--with-rc-local-script-path-stop=PATH], - [Path to /usr/sbin/halt.local]), - [RC_LOCAL_SCRIPT_PATH_STOP="$withval"], - [RC_LOCAL_SCRIPT_PATH_STOP="/usr/sbin/halt.local"]) - -AC_DEFINE_UNQUOTED(RC_LOCAL_SCRIPT_PATH_START, ["$RC_LOCAL_SCRIPT_PATH_START"], [Path of /etc/rc.local script]) -AC_DEFINE_UNQUOTED(RC_LOCAL_SCRIPT_PATH_STOP, ["$RC_LOCAL_SCRIPT_PATH_STOP"], [Path of /usr/sbin/halt.local script]) - -AC_SUBST(RC_LOCAL_SCRIPT_PATH_START) -AC_SUBST(RC_LOCAL_SCRIPT_PATH_STOP) - -# ------------------------------------------------------------------------------ AC_ARG_WITH(kbd-loadkeys, AS_HELP_STRING([--with-kbd-loadkeys=PATH], [Path to loadkeys]), @@ -815,8 +796,6 @@ AC_MSG_RESULT([ D-Bus system dir: ${with_dbussystemservicedir} Bash completions dir: ${with_bashcompletiondir} Zsh completions dir: ${with_zshcompletiondir} - Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} - Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP} TTY GID: ${TTY_GID} Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX} |