summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_stdio.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-19 17:31:42 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-19 17:31:42 +0000
commit25f65beed0677fa247c513705dbf538225f979c4 (patch)
treee0ec937937cba2d6279e97b3b7036fe0856d5bb2 /perl-install/install_steps_stdio.pm
parenta0b5f74447cc699c43c354cb6397ed554605729b (diff)
downloaddrakx-25f65beed0677fa247c513705dbf538225f979c4.tar
drakx-25f65beed0677fa247c513705dbf538225f979c4.tar.gz
drakx-25f65beed0677fa247c513705dbf538225f979c4.tar.bz2
drakx-25f65beed0677fa247c513705dbf538225f979c4.tar.xz
drakx-25f65beed0677fa247c513705dbf538225f979c4.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_stdio.pm')
-rw-r--r--perl-install/install_steps_stdio.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install_steps_stdio.pm b/perl-install/install_steps_stdio.pm
index 8122c3ba2..651f3ba16 100644
--- a/perl-install/install_steps_stdio.pm
+++ b/perl-install/install_steps_stdio.pm
@@ -29,25 +29,25 @@ sub installPackages {
my $o = shift;
my $old = \&log::ld;
- local *log::ld = sub {
+ 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): ";
+ print "Password: "; $w{password} = $o->readln();
+ print "Password (again for confirmation): ";
} until ($w{password} eq $o->readln());
$o->{default}{rootPassword} = $w{password};
@@ -61,13 +61,13 @@ sub addUser($) {
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): ";
+ 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;
}