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

diff --git a/debian/changelog b/debian/changelog
index b519936f5d0dd443ae8811bc96c42fff9dea1db0..f036ab9f195930d2980324d6b04c682bb809b997 100644 (file)
--- 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 57f455332b5dd5c91adc6805f4bdd7bb28f82b9f..cfd04ccf107f9c5fe1010b19484155a1934ff6d5 100644 (file)
--- 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
                ;;