diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-28 18:22:30 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-23 23:17:43 +0200 |
| commit | 968fa1786054cd83947d5cdd6816ed5d1376f6dc (patch) | |
| tree | 1bad3e4f46f04198680627992534c26c82d9fb85 | |
| parent | 67b7dfcde5acd9cdc3dac7b23716f30fdbc16ea5 (diff) | |
| download | tde-packaging-968fa1786054cd83947d5cdd6816ed5d1376f6dc.tar.gz tde-packaging-968fa1786054cd83947d5cdd6816ed5d1376f6dc.zip | |
Fix tdm start failure on Debian
This closes Bug 928
Thanks to Slávek Banko for the patch!
(cherry picked from commit 112314397ba6d2886dd2ee5d529c96355066ee83)
| -rw-r--r-- | debian/lenny/kdebase/debian/kdm-trinity.init | 4 | ||||
| -rw-r--r-- | debian/lenny/kdebase/debian/kdm-trinity.postinst | 6 | ||||
| -rw-r--r-- | debian/squeeze/kdebase/debian/kdm-trinity.init | 4 | ||||
| -rw-r--r-- | debian/squeeze/kdebase/debian/kdm-trinity.postinst | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/debian/lenny/kdebase/debian/kdm-trinity.init b/debian/lenny/kdebase/debian/kdm-trinity.init index effad2fd6..655877651 100644 --- a/debian/lenny/kdebase/debian/kdm-trinity.init +++ b/debian/lenny/kdebase/debian/kdm-trinity.init @@ -3,8 +3,8 @@ # Provides: x-display-manager kdm-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/kdebase/debian/kdm-trinity.postinst b/debian/lenny/kdebase/debian/kdm-trinity.postinst index 7b4ac4ee3..6b721b520 100644 --- a/debian/lenny/kdebase/debian/kdm-trinity.postinst +++ b/debian/lenny/kdebase/debian/kdm-trinity.postinst @@ -123,7 +123,11 @@ case "$1" in esac if [ -x "/etc/init.d/kdm-trinity" ]; then - update-rc.d kdm-trinity defaults 13 01 >/dev/null + if [ -x "`which insserv 2>/dev/null`" ]; then + insserv kdm-trinity >/dev/null + else + update-rc.d kdm-trinity defaults 13 01 >/dev/null + fi fi if [ -n "$NOSTART" ]; then diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.init b/debian/squeeze/kdebase/debian/kdm-trinity.init index effad2fd6..655877651 100644 --- a/debian/squeeze/kdebase/debian/kdm-trinity.init +++ b/debian/squeeze/kdebase/debian/kdm-trinity.init @@ -3,8 +3,8 @@ # Provides: x-display-manager kdm-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/kdebase/debian/kdm-trinity.postinst b/debian/squeeze/kdebase/debian/kdm-trinity.postinst index 7b4ac4ee3..6b721b520 100644 --- a/debian/squeeze/kdebase/debian/kdm-trinity.postinst +++ b/debian/squeeze/kdebase/debian/kdm-trinity.postinst @@ -123,7 +123,11 @@ case "$1" in esac if [ -x "/etc/init.d/kdm-trinity" ]; then - update-rc.d kdm-trinity defaults 13 01 >/dev/null + if [ -x "`which insserv 2>/dev/null`" ]; then + insserv kdm-trinity >/dev/null + else + update-rc.d kdm-trinity defaults 13 01 >/dev/null + fi fi if [ -n "$NOSTART" ]; then |