Fix TDM crash on certain systems when Plymouth is enabled

This resolves Bug 1453
pull/3/head
Timothy Pearson 11 years ago
parent 5798ef81c4
commit 0d32890227

@ -21,17 +21,21 @@ emits desktop-session-start
emits desktop-shutdown
script
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ]
# Check kernel command-line for inhibitors
for ARG in $(cat /proc/cmdline)
do
case "${ARG}" in
text|-s|s|S|single)
if [ -n "$UPSTART_EVENTS" ]
then
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] || { stop; exit 0; }
# Since we have no plymouth integration to take over the VT we simply
# 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) || :
if [ "$RUNLEVEL" = S -o "$RUNLEVEL" = 1 ]
then
# Single-user mode
exit 0
;;
esac
done
fi
fi
if [ -r /etc/default/locale ]; then
. /etc/default/locale

@ -21,17 +21,21 @@ emits desktop-session-start
emits desktop-shutdown
script
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ]
# Check kernel command-line for inhibitors
for ARG in $(cat /proc/cmdline)
do
case "${ARG}" in
text|-s|s|S|single)
if [ -n "$UPSTART_EVENTS" ]
then
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] || { stop; exit 0; }
# Since we have no plymouth integration to take over the VT we simply
# 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) || :
if [ "$RUNLEVEL" = S -o "$RUNLEVEL" = 1 ]
then
# Single-user mode
exit 0
;;
esac
done
fi
fi
if [ -r /etc/default/locale ]; then
. /etc/default/locale

@ -21,17 +21,21 @@ emits desktop-session-start
emits desktop-shutdown
script
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ]
# Check kernel command-line for inhibitors
for ARG in $(cat /proc/cmdline)
do
case "${ARG}" in
text|-s|s|S|single)
if [ -n "$UPSTART_EVENTS" ]
then
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] || { stop; exit 0; }
# Since we have no plymouth integration to take over the VT we simply
# 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) || :
if [ "$RUNLEVEL" = S -o "$RUNLEVEL" = 1 ]
then
# Single-user mode
exit 0
;;
esac
done
fi
fi
if [ -r /etc/default/locale ]; then
. /etc/default/locale

Loading…
Cancel
Save