# {{{ start X window system via grml-x
config_x_startup(){
-if checkbootparam startx ; then
+# make sure we start X only if startx is used *before* a nostartx option
+# so it's possible to disable automatic X startup using nostart
+if checkbootparam startx && ! grep -q 'startx.*nostartx' "$CMDLINE" ; then
if [ -x /usr/X11R6/bin/X ] ; then
if [ -z "$INSTALLED" ] ; then
WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"
fi
else
- eerror "We are not running from CD - startx will not work, skipping it.
- Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
+ eerror "We are not running from CD - startx will not work, skipping it."
+ eerror " -> Please use something like xdm, gdm or kdm for starting X on a harddisk system!" ; eend 1
fi
else
- eerror "/usr/X11R6/bin/X is not present on this grml flavour.
- Boot parameter startx does not work therefore." ; eend 1
+ eerror "/usr/X11R6/bin/X is not present on this grml flavour."
+ eerror " -> Boot parameter startx does not work therefore." ; eend 1
fi
fi
}
* Check for space after bootoption 'fast' so we do not conflict
with new kernel bootoption fastboot.
+ * New bootoption 'nostartx': if using startx as default bootoption
+ the bootoption 'nostartx' disables automatic startup of X.
- -- Michael Prokop <mika@grml.org> Tue, 28 Jul 2009 18:18:30 +0200
+ -- Michael Prokop <mika@grml.org> Wed, 05 Aug 2009 15:13:59 +0200
grml-autoconfig (0.8.23) unstable; urgency=low