Don't use systemctl redirect for init scripts with X-Interactive: true

diff --git a/debian/changelog b/debian/changelog
index 9ae64845575b1d837faddb0f7b40e53d7e498107..c13b34f684a5169fcc0fa43efa7e067dbc193b0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ systemd (16-1) experimental; urgency=low
   * New upstream release.  Closes: #609611
   * Get rid of now obsolete patches that are upstream.
   * Use the built-in cryptsetup support in systemd.
+  * Don't use systemctl redirect for init scripts with X-Interactive: true
 
   [ Michael Biebl ]
   * Update package description

diff --git a/debian/lsb-base-logging.sh b/debian/lsb-base-logging.sh
index cad93c9f7dc5b7813a5fe89023e61e5d79cbc174..57f455332b5dd5c91adc6805f4bdd7bb28f82b9f 100644 (file)
--- a/debian/lsb-base-logging.sh
+++ b/debian/lsb-base-logging.sh
@@ -20,7 +20,10 @@ if [ -e /sys/fs/cgroup/systemd ] ; then
     if [ $PPID -ne 1 ] && [ -z "$init" ] && [ -z "$_SYSTEMCTL_SKIP_REDIRECT" ] ; then
         case "$0" in
             /etc/init.d/*)
-               _use_systemctl=1
+               # Don't redirect if the init script has X-Interactive: true
+               if ! grep -qs "X-Interactive: true" "$0"; then
+                   _use_systemctl=1
+               fi
                ;;
        esac
     else