diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-03-16 20:04:26 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-03-16 20:04:26 +0000 |
| commit | 28f19070e51ab4752c1c82c2d02b9af1d84d3a37 (patch) | |
| tree | a18412c3225f914627c74ec887af22a0fbb0eb30 /perl-install/install_steps_interactive.pm | |
| parent | 633a781cca14d82bdc0c41a59caa79059c3aceb6 (diff) | |
| download | drakx-28f19070e51ab4752c1c82c2d02b9af1d84d3a37.tar drakx-28f19070e51ab4752c1c82c2d02b9af1d84d3a37.tar.gz drakx-28f19070e51ab4752c1c82c2d02b9af1d84d3a37.tar.bz2 drakx-28f19070e51ab4752c1c82c2d02b9af1d84d3a37.tar.xz drakx-28f19070e51ab4752c1c82c2d02b9af1d84d3a37.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 832b2c52d..157df8c82 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -559,14 +559,10 @@ sub servicesConfig { #------------------------------------------------------------------------------ sub printerConfig($) { my ($o) = @_; - $o->{printer}{want} = - $o->ask_yesorno(_("Printer"), - _("Would you like to configure a printer?"), - $o->{printer}{want}); - return if !$o->{printer}{want}; require printerdrake; - printerdrake::main($o->{prefix}, $o->{printer}, $o, sub { install_any::pkg_install($o, $_[0]) }); + eval { add2hash($o->{printer}, printerdrake::getinfo($o->{prefix})) }; + printerdrake::main($o->{printer}, $o, sub { install_any::pkg_install($o, $_[0]) }); } #------------------------------------------------------------------------------ @@ -591,7 +587,7 @@ _("Use MD5 passwords") => { val => \$o->{authentication}{md5}, type => 'bool', t ) : (), $::beginner ? () : ( _("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("yellow pages") }, ) - ], + ], complete => sub { $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,1); length $sup->{password} < 2 * $o->{security} |