Remove workarounds for services using X-Interactive.

The LSB X-Interactive support turned out to be broken and has been
removed upstream so we no longer need any special handling for those
type of services.

diff --git a/debian/changelog b/debian/changelog
index ceea6157aad1df5cb1ebb829255579d383449fa9..c0857781e8d7ef3ee27471a9a784b8acd53ba86f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ systemd (40-1) unstable; urgency=low
   * Update configure flags, use rootprefix instead of rootdir.
   * Copy intltool files instead of symlinking them.
   * Re-indent init-functions script.
+  * Remove workarounds for services using X-Interactive. The LSB X-Interactive
+    support turned out to be broken and has been removed upstream so we no
+    longer need any special handling for those type of services.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Tue, 07 Feb 2012 21:36:34 +0100
 

diff --git a/debian/init-functions b/debian/init-functions
index 00d9dcafe227519812bf5d0078491eef03490b7e..630475e056e37241bb92c18ac92ee03842d71131 100644 (file)
--- a/debian/init-functions
+++ b/debian/init-functions
@@ -21,19 +21,7 @@ if [ -e /sys/fs/cgroup/systemd ]; then
     if [ $PPID -ne 1 ] && [ -z "$init" ] && [ -z "$_SYSTEMCTL_SKIP_REDIRECT" ]; then
         case $(readlink -f "$0") in
             /etc/init.d/*)
-                # Don't redirect if the init script has X-Interactive: true
-                if ! grep -qs "^# X-Interactive:.*true" "$0"; then
-                    _use_systemctl=1
-                fi
-                # Redirect if there's a matching .service file in /etc or /lib
-                prog=${0##*/}
-                service="${prog%.sh}.service"
-                fp=$(systemctl -p FragmentPath show $service 2>/dev/null | sed 's/^FragmentPath=//')
-                case "$fp"  in
-                    /lib/systemd/system/*|/etc/systemd/system/*)
-                        _use_systemctl=1
-                        ;;
-                esac
+                _use_systemctl=1
                 # Some services can't reload through the .service file,
                 # but can through the init script.
                 if [ "$(systemctl -p CanReload show $service 2>/dev/null)" = "CanReload=no" ] && [ "$1" = "reload" ]; then

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index d06dba5ef787fded8cf497ac7cdea62c5b1e52f9..d2a145dacd433664885a6a4c210e0fa3d60b814e 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -8,7 +8,7 @@
 [Unit]
 Description=Getty on %I
 BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service openvpn.service apache2.service
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl