summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-28 18:22:30 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-28 18:22:30 -0500
commit112314397ba6d2886dd2ee5d529c96355066ee83 (patch)
tree64913e133903681fd1c095ba6b6876a720829f64
parent9016533d378890aeefb6e8e27a8aafab5b1011d3 (diff)
downloadtde-packaging-112314397ba6d2886dd2ee5d529c96355066ee83.tar.gz
tde-packaging-112314397ba6d2886dd2ee5d529c96355066ee83.zip
Fix tdm start failure on Debian
This closes Bug 928 Thanks to Slávek Banko for the patch!
-rw-r--r--debian/lenny/tdebase/debian/tdm-trinity.init4
-rw-r--r--debian/lenny/tdebase/debian/tdm-trinity.postinst6
-rw-r--r--debian/squeeze/tdebase/debian/tdm-trinity.init4
-rw-r--r--debian/squeeze/tdebase/debian/tdm-trinity.postinst6
4 files changed, 14 insertions, 6 deletions
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.init b/debian/lenny/tdebase/debian/tdm-trinity.init
index ffe71c9bb..64b81d1ed 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.init
+++ b/debian/lenny/tdebase/debian/tdm-trinity.init
@@ -3,8 +3,8 @@
# Provides: x-display-manager tdm-trinity
# Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
-# Should-Start: console-screen
-# Should-Stop: console-screen
+# Should-Start: console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop: console-screen kbd
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: X display manager for Trinity
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.postinst b/debian/lenny/tdebase/debian/tdm-trinity.postinst
index 60a1a5e34..1fd604c2a 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.postinst
+++ b/debian/lenny/tdebase/debian/tdm-trinity.postinst
@@ -123,7 +123,11 @@ case "$1" in
esac
if [ -x "/etc/init.d/tdm-trinity" ]; then
- update-rc.d tdm-trinity defaults 13 01 >/dev/null
+ if [ -x "`which insserv 2>/dev/null`" ]; then
+ insserv tdm-trinity >/dev/null
+ else
+ update-rc.d tdm-trinity defaults 13 01 >/dev/null
+ fi
fi
if [ -n "$NOSTART" ]; then
diff --git a/debian/squeeze/tdebase/debian/tdm-trinity.init b/debian/squeeze/tdebase/debian/tdm-trinity.init
index ffe71c9bb..64b81d1ed 100644
--- a/debian/squeeze/tdebase/debian/tdm-trinity.init
+++ b/debian/squeeze/tdebase/debian/tdm-trinity.init
@@ -3,8 +3,8 @@
# Provides: x-display-manager tdm-trinity
# Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
-# Should-Start: console-screen
-# Should-Stop: console-screen
+# Should-Start: console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop: console-screen kbd
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: X display manager for Trinity
diff --git a/debian/squeeze/tdebase/debian/tdm-trinity.postinst b/debian/squeeze/tdebase/debian/tdm-trinity.postinst
index 60a1a5e34..1fd604c2a 100644
--- a/debian/squeeze/tdebase/debian/tdm-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/tdm-trinity.postinst
@@ -123,7 +123,11 @@ case "$1" in
esac
if [ -x "/etc/init.d/tdm-trinity" ]; then
- update-rc.d tdm-trinity defaults 13 01 >/dev/null
+ if [ -x "`which insserv 2>/dev/null`" ]; then
+ insserv tdm-trinity >/dev/null
+ else
+ update-rc.d tdm-trinity defaults 13 01 >/dev/null
+ fi
fi
if [ -n "$NOSTART" ]; then