diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:24:30 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:24:30 +0200 |
| commit | 6102459f1761588f23e1ecbfa373bccd3dd52b7b (patch) | |
| tree | 0f4895955493693ddff309f96d4dec1c42de5593 | |
| parent | 28747a0a626b15a9e0bfb34e0a729325e503820f (diff) | |
Remove debug-shell / secure-tty support
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 0 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 635735aee8..d18cedcd51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -996,8 +996,6 @@ substitutions = \ '|VERSION=$(VERSION)|' \ '|rootprefix=$(rootprefix)|' \ '|udevlibexecdir=$(udevlibexecdir)|' \ - '|SUSHELL=$(SUSHELL)|' \ - '|DEBUGTTY=$(DEBUGTTY)|' \ '|MKDIR_P=$(MKDIR_P)|' \ '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \ '|VARLOGDIR=$(varlogdir)|' \ diff --git a/configure.ac b/configure.ac index ffe648caa4..ea363c5a26 100644 --- a/configure.ac +++ b/configure.ac @@ -373,22 +373,6 @@ fi AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"]) -AC_ARG_WITH(debug-shell, - AS_HELP_STRING([--with-debug-shell=PATH], - [Path to debug shell binary]), - [SUSHELL="$withval"],[ - AS_IF([test "x${have_selinux}" != "xno"], [SUSHELL="/sbin/sushell"] , [SUSHELL="/bin/sh"])]) - -AC_SUBST(SUSHELL) - -AC_ARG_WITH([debug-tty], - AS_HELP_STRING([--with-debug-tty=PATH], - [Specify the tty device for debug shell]), - [DEBUGTTY="$withval"], - [DEBUGTTY=/dev/tty9]) - -AC_SUBST(DEBUGTTY) - AC_ARG_WITH([certificate-root], AS_HELP_STRING([--with-certificate-root=PATH], [Specify the prefix for TLS certificates [/etc/ssl]]), @@ -1314,7 +1298,6 @@ AC_MSG_RESULT([ Zsh completions dir: ${with_zshcompletiondir} Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP} - Debug shell: ${SUSHELL} @ ${DEBUGTTY} TTY GID: ${TTY_GID} Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX} |