From d7507de0ce88bdf9b1491d8b29ee8ae481cfe9ff Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 21 Oct 1999 08:49:00 +0000
Subject: *** empty log message ***

---
 perl-install/install2.pm                  | 2 +-
 perl-install/install_steps_interactive.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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},
-- 
cgit v1.2.1