From 11b83c603e8fc86bdf496ea0b4e1df7524ec0236 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 10 Jun 2007 13:12:17 +0200 Subject: [PATCH] zsh-login: do not run grml-quickconfig when bootoption startx is present --- debian/changelog | 7 +++++++ usr_bin/zsh-login | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 90b5382..081d7dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-scripts (1.0.4) unstable; urgency=low + + * zsh-login: do not run grml-quickconfig when bootoption startx + is present. Thanks for the bugreport, Darshaka Pathirana! + + -- Michael Prokop Sun, 10 Jun 2007 13:11:38 +0200 + grml-scripts (1.0.3) unstable; urgency=low * grml-lang: support dvorak keyboard layout diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login index 1f8d270..639585d 100755 --- a/usr_bin/zsh-login +++ b/usr_bin/zsh-login @@ -33,7 +33,7 @@ case "$CMDLINE" in flite -o play -t "Finished booting" fi ;; - noquick) + noquick*|startx*) # do nothing ;; *) # by default run grml-quickconfig, but only if running as root -- 2.1.4