diff options
Diffstat (limited to 'perl-install/install_steps_stdio.pm')
-rw-r--r-- | perl-install/install_steps_stdio.pm | 56 |
1 files changed, 8 insertions, 48 deletions
diff --git a/perl-install/install_steps_stdio.pm b/perl-install/install_steps_stdio.pm index a3c634b4d..734c4f451 100644 --- a/perl-install/install_steps_stdio.pm +++ b/perl-install/install_steps_stdio.pm @@ -14,11 +14,16 @@ use install_steps_interactive; use install_any; use log; -1; +sub new($$) { + my ($type, $o) = @_; + + $o->{partitioning}{readonly} = 1; #- needed til diskdrake is graphic only... + (bless {}, ref $type || $type)->SUPER::new($o); +} sub enteringStep { my ($o, $step) = @_; - print _("Entering step `%s'\n", $o->{steps}{$step}{text}); + print _("Entering step `%s'\n", translate($o->{steps}{$step}{text})); $o->SUPER::enteringStep($step); } sub leavingStep { @@ -27,49 +32,4 @@ sub leavingStep { print "--------\n"; } -sub installPackages { - my $o = shift; - - my $old = \&log::ld; - local *log::ld = sub { - my $m = shift; - if ($m =~ /^starting installing/) { - my $name = first($_[0] =~ m|([^/]*)-.+?-|); - print("installing package $name"); - } else { goto $old } - }; - $o->SUPER::installPackages(@_); -} - - -sub setRootPassword($) { - my ($o) = @_; - - my (%w); - do { - $w{password} and print "You must enter the same password, please try again\n"; - print "Password: "; $w{password} = $o->readln(); - print "Password (again for confirmation): "; - } until ($w{password} eq $o->readln()); - - $o->{default}{rootPassword} = $w{password}; - $o->SUPER::setRootPassword; -} - -sub addUser($) { - my ($o) = @_; - my %w; - print "\nCreating a normal user account:\n"; - print "Name: "; $w{name} = $o->readln() or return; - do { - $w{password} and print "You must enter the same password, please try again\n"; - print "Password: "; $w{password} = $o->readln(); - print "Password (again for confirmation): "; - } until ($w{password} eq $o->readln()); - print "Real name: "; $w{realname} = $o->readln(); - - $w{shell} = $o->ask_from_list('', 'Shell', [ install_any::shells($o) ], "/bin/bash"); - - $o->{default}{user} = { map { $_ => $w{$_}->get_text } qw(name password realname shell) }; - $o->SUPER::addUser; -} +1; |