summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-08-07 10:24:55 +0000
committerFrancois Pons <fpons@mandriva.com>2000-08-07 10:24:55 +0000
commit40dcd0a59c0cce9b75f40b338799f5f28dd87cf6 (patch)
tree7d1ec08f4fe6eb0f1ae7c9927a30f2fda7b2347c
parent995ea591c5076d0a1f809f4b0c5d919db7510c88 (diff)
downloaddrakx-backup-do-not-use-40dcd0a59c0cce9b75f40b338799f5f28dd87cf6.tar
drakx-backup-do-not-use-40dcd0a59c0cce9b75f40b338799f5f28dd87cf6.tar.gz
drakx-backup-do-not-use-40dcd0a59c0cce9b75f40b338799f5f28dd87cf6.tar.bz2
drakx-backup-do-not-use-40dcd0a59c0cce9b75f40b338799f5f28dd87cf6.tar.xz
drakx-backup-do-not-use-40dcd0a59c0cce9b75f40b338799f5f28dd87cf6.zip
*** empty log message ***
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/install_steps.pm2
3 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index e2e37708b..721763378 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-07 François Pons <fpons@mandrakesoft.com>
+
+ * Xconfigurator.pm: added SiS6326 in the list of chipset that
+ needVideoRam, reported on ml.
+ * install_steps.pm: fixed auto install of printer.
+
2000-08-06 Pixel <pixel@mandrakesoft.com>
* interactive.pm (ask_from_listf): created this GREAT function
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index bbac283d3..47bff9b69 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -44,7 +44,7 @@ sub readCardsDB {
CHIPSET => sub {
$card->{chipset} = $val;
$card->{flags}{needChipset} = 1 if $val eq 'GeForce DDR';
- $card->{flags}{needVideoRam} = 1 if member($val, qw(mgag10 mgag200 RIVA128));
+ $card->{flags}{needVideoRam} = 1 if member($val, qw(mgag10 mgag200 RIVA128 SiS6326));
},
SERVER => sub { $card->{server} = $val; },
DRIVER => sub { $card->{driver} = $val; },
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 2b7c44417..58e15fde7 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -659,6 +659,8 @@ sub configurePrinter {
$o->installPackages($o->{packages});
require printer;
+ eval { add2hash($o->{printer}, printer::getinfo($o->{prefix})) }; #- get existing configuration.
+ printer::read_printer_db(); #- load printer db, else configuration will fails.
foreach (keys %{$o->{printer}{configured} || {}}) {
log::l("configuring printer queue $_->{queue}");
printer::copy_printer_params($_, $o->{printer});