Author: baggins
Date: Fri Apr 27 20:26:14 2012
New Revision: 12563
Modified:
xinitrc-ng/trunk/prefdm
Log:
- always quit plymouth, we have no support for it in our DMs
Modified: xinitrc-ng/trunk/prefdm
==============================================================================
--- xinitrc-ng/trunk/prefdm (original)
+++ xinitrc-ng/trunk/prefdm Fri Apr 27 20:26:14 2012
@@ -8,7 +8,6 @@
# Run preferred X display manager
preferred=
-splash_quit_command=""
if [ -f /etc/sysconfig/desktop ]; then
. /etc/sysconfig/desktop
if [ "$DISPLAYMANAGER" = GNOME ]; then
@@ -17,24 +16,19 @@
preferred=/usr/bin/kdm
elif [ "$DISPLAYMANAGER" = LightDM ]; then
preferred=/usr/sbin/lightdm
- splash_quit_command="plymouth quit"
elif [ "$DISPLAYMANAGER" = LXDE ]; then
preferred=/usr/sbin/lxdm
- splash_quit_command="plymouth quit"
elif [ "$DISPLAYMANAGER" = WDM ]; then
preferred=/usr/bin/wdm
- splash_quit_command="plymouth quit"
elif [ "$DISPLAYMANAGER" = XDM ]; then
preferred=/usr/bin/xdm
- splash_quit_command="plymouth quit"
elif [ -n "$DISPLAYMANAGER" ]; then
preferred=$DISPLAYMANAGER
- splash_quit_command="plymouth quit"
fi
fi
# shut down boot splash
-$splash_quit_command >/dev/null 2>&1
+plymouth quit >/dev/null 2>&1
[ -n "$preferred" -a -x "$preferred" ] && exec $preferred "$@" >/dev/null 2>&1
</dev/null
@@ -47,5 +41,4 @@
[ -x /usr/bin/wdm ] && exec /usr/bin/wdm "$@" >/dev/null 2>&1 </dev/null
# catch all exit error
-plymouth quit >/dev/null 2>&1
exit 1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
