From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 16 Jan 2011 11:25:46 +0000 (+0100)
Subject: Don't use systemctl redirect for init scripts with X-Interactive: true
X-Git-Tag: 16-1~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=810aee92ffeee92136b79725021afea0b3c04305;p=systemd

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

diff --git a/debian/changelog b/debian/changelog
index 9ae64845..c13b34f6 100644
--- 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 cad93c9f..57f45533 100644
--- 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