summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-07 20:23:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-07 20:23:47 +0000
commit2998b750f576457a29b69b462a9c224a06c96d3c (patch)
tree1025f4ede33c966da6d57de627d142cebc6b49c8 /perl-install/Xconfig
parent835802d20ee96dbb3805d4fe08d4a2900aa3cd12 (diff)
downloaddrakx-2998b750f576457a29b69b462a9c224a06c96d3c.tar
drakx-2998b750f576457a29b69b462a9c224a06c96d3c.tar.gz
drakx-2998b750f576457a29b69b462a9c224a06c96d3c.tar.bz2
drakx-2998b750f576457a29b69b462a9c224a06c96d3c.tar.xz
drakx-2998b750f576457a29b69b462a9c224a06c96d3c.zip
(configure_everything): in $auto mode, don't test nor ask when the config failed
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r--perl-install/Xconfig/main.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index b3d291c07..0e9f335c5 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -54,10 +54,11 @@ sub configure_everything {
$options->{VideoRam_probed} = $X->{monitor}{VideoRam_probed};
$ok &&= $X->{card} = Xconfig::card::configure($in, $raw_X, $do_pkgs, $auto, $options);
$ok &&= Xconfig::screen::configure($raw_X, $X->{card});
- $ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor});
- $ok &&= Xconfig::test::test($in, $raw_X, $X->{card}, $auto, 'skip_badcard');
+ $ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor}, $auto);
+ $ok &&= Xconfig::test::test($in, $raw_X, $X->{card}, '', 'skip_badcard') if !$auto;
if (!$ok) {
+ return if $auto;
($ok) = configure_chooser_raw($in, $raw_X, $do_pkgs, $options, $X, 1);
}
$X->{various} ||= Xconfig::various::various($in, $X->{card}, $options, $auto);