From 5256e630ff3e2080ae9c12f8c3b33b936fab2b7d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 5 Aug 2009 15:14:37 +0200 Subject: [PATCH] New bootoption 'nostartx' --- autoconfig.functions | 12 +++++++----- debian/changelog | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 58eed90..dcb76da 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1857,7 +1857,9 @@ create_mnt_dirs(){ # {{{ 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)" @@ -1892,12 +1894,12 @@ EOF 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 } diff --git a/debian/changelog b/debian/changelog index 713da60..8d8cdb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ grml-autoconfig (0.8.24) UNRELEASED; urgency=low * 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 Tue, 28 Jul 2009 18:18:30 +0200 + -- Michael Prokop Wed, 05 Aug 2009 15:13:59 +0200 grml-autoconfig (0.8.23) unstable; urgency=low -- 2.1.4