From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 13 Feb 2011 07:39:20 +0000 (+0100)
Subject: Improve regex in lsb-base-logging.sh for X-Interactive scripts.
X-Git-Tag: 17-1~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=815484f41052cf13ff5b0c25d799b8236d466610;p=systemd

Improve regex in lsb-base-logging.sh for X-Interactive scripts.
---

diff --git a/debian/changelog b/debian/changelog
index b519936f..f036ab9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ systemd (17-1) UNRELEASED; urgency=low
 
   [ Michael Biebl ]
   * Bump build dependency on valac to (>= 0.10.3).
+  * Improve regex in lsb-base-logging.sh for X-Interactive scripts.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Sun, 13 Feb 2011 08:31:09 +0100
 
diff --git a/debian/lsb-base-logging.sh b/debian/lsb-base-logging.sh
index 57f45533..cfd04ccf 100644
--- a/debian/lsb-base-logging.sh
+++ b/debian/lsb-base-logging.sh
@@ -21,7 +21,7 @@ if [ -e /sys/fs/cgroup/systemd ] ; then
         case "$0" in
             /etc/init.d/*)
 		# Don't redirect if the init script has X-Interactive: true
-		if ! grep -qs "X-Interactive: true" "$0"; then
+		if ! grep -qs "^# X-Interactive:.*true" "$0"; then
 		    _use_systemctl=1
 		fi
 		;;