summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/card.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/card.pm
parent5e4482191b73a497dc125b065eea03b26d8335fb (diff)
downloaddrakx-backup-do-not-use-3467af25441cc4cf1510cf925f9916f64d43f50e.tar
drakx-backup-do-not-use-3467af25441cc4cf1510cf925f9916f64d43f50e.tar.gz
drakx-backup-do-not-use-3467af25441cc4cf1510cf925f9916f64d43f50e.tar.bz2
drakx-backup-do-not-use-3467af25441cc4cf1510cf925f9916f64d43f50e.tar.xz
drakx-backup-do-not-use-3467af25441cc4cf1510cf925f9916f64d43f50e.zip
when prompting for VideoRam, default to the value obtained via DDC
Diffstat (limited to 'perl-install/Xconfig/card.pm')
-rw-r--r--perl-install/Xconfig/card.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index f1eed7a0b..9387d9e74 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -254,8 +254,8 @@ sub configure_auto_install {
$card->{prog} = install_server($card, $options, $do_pkgs);
if ($card->{needVideoRam} && !$card->{VideoRam}) {
- $card->{VideoRam} = 4096;
- log::l("argh, I need to know VideoRam! Taking a default value: VideoRam = $card->{VideoRam}");
+ $card->{VideoRam} = $options->{VideoRam_probed} || 4096;
+ log::l("argh, I need to know VideoRam! Taking " . ($options->{probed_VideoRam} ? "the probed" : "a default") . " value: VideoRam = $card->{VideoRam}");
}
to_raw_X($card, $raw_X);
$card;
@@ -278,7 +278,7 @@ sub configure {
$card->{prog} = install_server($card, $options, $do_pkgs);
$in->ask_from('', _("Select the memory size of your graphics card"),
- [ { val => \ ($card->{VideoRam} = 4096),
+ [ { val => \ ($card->{VideoRam} = $options->{VideoRam_probed} || 4096),
type => 'list',
list => [ ikeys %VideoRams ],
format => sub { translate($VideoRams{$_[0]}) },