diff options
Diffstat (limited to 'ubuntu/maverick/tdebase')
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/tdm-trinity.postinst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst index 4977c4998..c33169e82 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst @@ -142,8 +142,9 @@ case "$1" in esac # Upstart is not active? +UPSTART_DIVERT=`dpkg-divert --listpackage /sbin/initctl` UPSTART_ACTIVE=`dbus-send --system --print-reply --dest=com.ubuntu.Upstart /com/ubuntu/Upstart org.freedesktop.DBus.Properties.Get string:com.ubuntu.Upstart0_6 string:version 2>/dev/null || true` -if [ -z "$UPSTART_ACTIVE" ]; then +if [ -z "$UPSTART_DIVERT" ] && [ -z "$UPSTART_ACTIVE" ]; then echo "Upstart is not active - masking initctl" >&2 dpkg-divert --local --rename --add /sbin/initctl ln -s /bin/true /sbin/initctl @@ -152,7 +153,7 @@ fi #DEBHELPER# # Upstart is not active? -if [ -z "$UPSTART_ACTIVE" ]; then +if [ -z "$UPSTART_DIVERT" ] && [ -z "$UPSTART_ACTIVE" ]; then rm /sbin/initctl dpkg-divert --local --rename --remove /sbin/initctl fi |