* Work around the 'intel' driver problem [Closes: issue177]
* Support fallback option [Closes: issue169]
* Do not run hwinfo if not really necessary [Closes: issue168]
+ * Check whether $WINDOWMANAGER is executable at all before using
+ it in $XINITRC.
-- Michael Prokop <mika@grml.org> Mon, 26 Mar 2007 19:40:15 +0200
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Mon Mär 26 21:26:31 CEST 2007 [mika]
+# Latest change: Mon Mär 26 22:11:44 CEST 2007 [mika]
################################################################################
# debugging {{{
exit 1
fi
- check4root && ROOT='1' || ROOT=''
+ check4root &>/dev/null && ROOT='1' || ROOT=''
# }}}
# set variables {{{
print ""
if [ -z "$DISPLAY" ] ; then
print "$bold_color$fg[green]Now trying to run startx.$reset_color"
- startx ~/.xinitrc -- $XOPTS
+ startx $XINITRC -- $XOPTS
else
print "$bold_color$fg[green]Now trying to run startx on display $DISPLAY.$reset_color"
- startx ~/.xinitrc -- :$DISPLAY $XOPTS
+ startx $XINITRC -- :$DISPLAY $XOPTS
fi
else
print "$bold_color$fg[blue]Not running startx as requested via option.$reset_color"
# }}}
# xinitrc {{{
+ if ! [ -x "$(which $WINDOWMANAGER)" ] ; then
+ print "$bg[black]$fg[red]${bold_color}Fatal: windowmanager $fg[blue]$WINDOWMANAGER$fg[red] not executable, startx won' work.${reset_color}">&2
+ bailout
+ fi
if [ -w "$XINITRC" ] ; then
sed -i "s|^[^#]*exec.*| exec $WINDOWMANAGER|g" $XINITRC
runit || failed