From e5f2386a7884932cffd7c862b6ddedbd2e8a6810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 30 Aug 2015 11:52:45 +0200 Subject: Added verification if masking of initctl already exists This fixes tdm instalation on Ubuntu in chroot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ubuntu/maverick/tdebase/debian/tdm-trinity.postinst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick/tdebase/debian') 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 -- cgit v1.2.1