summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-21 08:49:00 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-21 08:49:00 +0000
commitd7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff (patch)
tree4bf8bcff985be6c196ce143b4a5a9b8f95afe66d
parenta87392ce672688850dc174df6a39c7fe745175fa (diff)
downloaddrakx-backup-do-not-use-d7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff.tar
drakx-backup-do-not-use-d7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff.tar.gz
drakx-backup-do-not-use-d7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff.tar.bz2
drakx-backup-do-not-use-d7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff.tar.xz
drakx-backup-do-not-use-d7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff.zip
*** empty log message ***
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 69c50eff3..e789293b6 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -121,7 +121,7 @@ $o = $::o = {
autoSCSI => 0,
mkbootdisk => 1, #- no mkbootdisk if 0 or undef, find a floppy with 1
#- packages => [ qw() ],
- partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0, readonly => 0 },
+ partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0, readonly => 1 },
#- partitions => [
#- { mntpoint => "/boot", size => 16 << 11, type => 0x83 },
#- { mntpoint => "/", size => 256 << 11, type => 0x83 },
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c8eee3ac3..2534f8acd 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -505,7 +505,7 @@ sub setRootPassword($) {
$o->{superuser}{password2} ||= $o->{user}{password} ||= "";
my $sup = $o->{superuser};
- $o->ask_from_entries_ref(_("Set root password"),
+ $o->ask_from_entries_ref([_("Set root password"), _("Ok"), _("No password")],
_("Set root password"),
[_("Password:"), _("Password (again):")],
[{ val => \$sup->{password}, hidden => 1},