Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!
| author | Michael Prokop <mika@grml.org> |
| Mon Mar 26 21:33:22 2007 +0200 (20 months ago) | |
| changeset 15 | 2ea8c3aef9c8 |
| manifest | 2ea8c3aef9c8 |
| parent 14 | ad4ef9ee859f |
| child 16 | 40258cbb41c5 |
--- a/grml-x Mon Mar 26 21:26:48 2007 +0200+++ b/grml-x Mon Mar 26 21:33:22 2007 +0200@@ -383,7 +383,7 @@ parse_options()fiif [[ "$o_fallback" != "" ]]; then- SKIPHWINFO="yes"+ FALLBACK="yes"if [ -r /etc/X11/xorg.conf.example ] ; thensudo cp /etc/X11/xorg.conf.example $XCONFIGprint "$bold_color$fg[blue]Copying /etc/X11/xorg.conf.example to $XCONFIG as requested via fallback option."@@ -442,7 +442,7 @@ parse_options()Option \"XkbVariant\" \"nodeadkeys\""fi- if [ -n "$FORCE" -o ! -r "$XCONFIG" -o -n "$SKIPHWINFO" ] ; then+ if [ -n "$FORCE" -o ! -r "$XCONFIG" -a -z "$FALLBACK" ] ; thenprint -n "$bold_color$fg[blue]Gathering hardware information...$fg[red]"sync # get hsync/vsync@@ -758,7 +758,7 @@ function writeconfigprint -n "$bold_color$fg[blue]Creating $XCONFIG: $fg[red]"writeit && print "$fg[green]done$reset_color"else- if [ -z "$FORCE" ] ; then+ if [ -z "$FORCE" -a -z "$FALLBACK" ] ; thenprint "$bold_color$fg[blue]Notice: $XCONFIG exists already.Use the force-option (-force) to force creation.$fg[red]"