summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/main.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-08 20:16:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-08 20:16:05 +0000
commit3467af25441cc4cf1510cf925f9916f64d43f50e (patch)
tree5bd9c00a5df7ca3f3aceeb1ec0e4be5d4b938d7a /perl-install/Xconfig/main.pm
parent5e4482191b73a497dc125b065eea03b26d8335fb (diff)
downloaddrakx-3467af25441cc4cf1510cf925f9916f64d43f50e.tar
drakx-3467af25441cc4cf1510cf925f9916f64d43f50e.tar.gz
drakx-3467af25441cc4cf1510cf925f9916f64d43f50e.tar.bz2
drakx-3467af25441cc4cf1510cf925f9916f64d43f50e.tar.xz
drakx-3467af25441cc4cf1510cf925f9916f64d43f50e.zip
when prompting for VideoRam, default to the value obtained via DDC
Diffstat (limited to 'perl-install/Xconfig/main.pm')
-rw-r--r--perl-install/Xconfig/main.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index b8a2656b9..10cc58f1c 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -35,8 +35,9 @@ sub configure_resolution {
sub configure_everything_auto_install {
my ($raw_X, $do_pkgs, $old_X, $options) = @_;
- my $card = Xconfig::card::configure_auto_install($raw_X, $do_pkgs, $old_X, $options) or return;
my $monitor = Xconfig::monitor::configure_auto_install($raw_X, $old_X) or return;
+ $options->{VideoRam_probed} = $monitor->{VideoRam_probed};
+ my $card = Xconfig::card::configure_auto_install($raw_X, $do_pkgs, $old_X, $options) or return;
Xconfig::screen::configure($raw_X, $card) or return;
my $resolution = Xconfig::resolution_and_depth::configure_auto_install($raw_X, $card, $monitor, $old_X);
@@ -51,8 +52,9 @@ sub configure_everything {
my ($in, $raw_X, $do_pkgs, $auto, $options) = @_;
my $X = {};
my $ok = 1;
- $ok &&= $X->{card} = Xconfig::card::configure($in, $raw_X, $do_pkgs, $auto, $options);
$ok &&= $X->{monitor} = Xconfig::monitor::configure($in, $raw_X, $auto);
+ $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}, $auto);
$ok &&= Xconfig::test::test($in, $raw_X, $X->{card}, $auto);