From 9036e8be7152d8aa3553a572ef7a7641ec21cfb4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 5 Aug 2009 15:17:22 +0200 Subject: [PATCH] grml-cheatcodes: document bootoption 'nostartx' --- debian/changelog | 3 ++- templates/GRML/grml-cheatcodes.txt | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 70c7646..41a248b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ grml-live (0.9.21) UNRELEASED; urgency=low [Closes: issue716] * Provide information about grml-live version and Debian/suite through /etc/grml_live_version in the generated ISO. [Closes: issue637] + * grml-cheatcodes: document bootoption 'nostartx'. - -- Michael Prokop Wed, 05 Aug 2009 04:27:20 +0200 + -- Michael Prokop Wed, 05 Aug 2009 15:16:57 +0200 grml-live (0.9.20) unstable; urgency=low diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index d8d8568..4f46060 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -136,6 +136,10 @@ grml distcc=$NETWORK,$INTERFACE Activate distcc-daemon to listen on specifie grml gcc=3.4 gpp=3.4 Link /usr/bin/gcc, /usr/bin/cpp and /usr/bin/c++ to specified version grml startx{=windowmanager} Start X window system automatically Default window manager (if not provided): wm-ng (wrapper around fluxbox) +grml nostartx If using startx as default bootoption the nostartx *disables* automatic + startup of X again. (This bootoption is relevant for grml based derivatives + which decide to enable startx by default only, plain grml does not use + automatic startup of X by default.) Accessibility related settings: ------------------------------- -- 2.1.4