summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-05 18:45:23 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-05 18:45:23 +0000
commit969bc065596476bce5cfed0bb7ffd263f48eb1d5 (patch)
tree8f890d39f7b1ccfa6dbeb8f7cc3281748ee30f46 /perl-install/install_steps_interactive.pm
parent8255a2010a0698471fb35f42b1ebcad3462f153a (diff)
downloaddrakx-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar
drakx-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar.gz
drakx-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar.bz2
drakx-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar.xz
drakx-969bc065596476bce5cfed0bb7ffd263f48eb1d5.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e8ec6c4fd..f14a9390c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -621,16 +621,19 @@ sub printerConfig {
require printer;
require printerdrake;
+ log::l("clicked=$clicked\n");
if ($::beginner && !$clicked) {
printerdrake::auto_detect($o) or return;
}
+ log::l("after clicked=$clicked\n");
#- bring interface up for installing ethernet packages but avoid ppp by default,
#- else the guy know what he is doing...
- $o->upNetwork('pppAvoided');
+ #$o->upNetwork('pppAvoided');
eval { add2hash($o->{printer} ||= {}, printer::getinfo($o->{prefix})) };
- printerdrake::main($o->{printer}, $o, sub { $o->pkg_install($_[0]) });
+ $o->{printer}{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4';
+ printerdrake::main($o->{printer}, $o, sub { $o->pkg_install($_[0]) }, sub { $o->upNetwork('pppAvoided') });
}
#------------------------------------------------------------------------------