summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-08 15:52:13 -0500
committerSlávek Banko <slavek.banko@axis.cz>2015-04-09 20:43:34 +0200
commit84aaa3b131a0b8c2e78de1db7d8bff7ab2df38f8 (patch)
tree75136daca632e75ea3766fbcef535e0b1bba4aab /ubuntu
parent506a260d0e411ca72b7b7c3e258b2843418bb03c (diff)
downloadtde-packaging-84aaa3b131a0b8c2e78de1db7d8bff7ab2df38f8.tar.gz
tde-packaging-84aaa3b131a0b8c2e78de1db7d8bff7ab2df38f8.zip
Fix tdm-trinity not starting on Ubuntu due to Plymouth hang
Continually retry tdm start on Ubuntu (cherry picked from commit bbf51c9c3453eaeb9192af27aa797edffe66ff80)
Diffstat (limited to 'ubuntu')
-rwxr-xr-xubuntu/maverick/tdebase/debian/tdm-trinity.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
index 927006e30..61260c91f 100755
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
@@ -16,6 +16,9 @@ start on ((filesystem
stop on runlevel [016]
+respawn
+respawn limit unlimited
+
emits login-session-start
emits desktop-session-start
emits desktop-shutdown
@@ -29,7 +32,7 @@ script
# quit plymouth all the time. Note that sleeping appears necessary
# as the VT freeing is somewhat delayed and TDM would otherwise go
# to configured KVT+1 (if plymouth was using it).
- $(plymouth --quit && plymouth --wait && sleep 1) || :
+ $(plymouth --quit && sleep 1) || :
if [ "$RUNLEVEL" = S -o "$RUNLEVEL" = 1 ]
then
# Single-user mode