summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--configure.ac4
2 files changed, 7 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 17aa5fb025..aad574ef74 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ systemd System and Service Manager
CHANGES WITH 233 in spe
+ * The shell invoked by debug-shell.service now defaults to /bin/sh in
+ all cases. If distributions want to use a different shell for this
+ purpose (for example Fedora's /sbin/sushell) they need to specify
+ this explicitly at configure time using --with-debug-shell=.
+
* The confirmation spawn prompt has been reworked to offer the
following choices:
diff --git a/configure.ac b/configure.ac
index 11bd46cbab..71b330f05d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -531,8 +531,8 @@ AS_IF([test "x$enable_wheel_group" != "xno"], [
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"])])
+ [SUSHELL="$withval"],
+ [SUSHELL="/bin/sh"])
AC_SUBST(SUSHELL)