no_comment

6 files changed, 74 insertions, 36 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 53d4a233f..c7d6a7eaf 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -727,8 +727,13 @@ Would you like X to start when you reboot?"), 1);
 
 	$in->ask_warn(_("X successfully configured"),
 _("Configuration file has been written. Take a look at it before running 'startx'.
+
 Within the server, press Ctrl, Alt and '+' simultaneously to cycle through video resolutions.
+
 Pressing Ctrl, Alt and Backspace simultaneously immediately exits the server
-For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.")) unless $::auto;
+
+For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.
+
+")) unless $::auto;
     }
 }
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 6aeae4c75..1d9ce7df6 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -60,23 +60,26 @@ on your system), as suggested by the installation guide. These
 are the options you will need to provide to the driver."),
 
 partitionDisks =>
- __("At this point, hard drive partitions must be defined. (Unless you
-are overwriting a previous install of Linux and have already defined
-your hard drive partitions as desired.) This operation consists of
-logically dividing the computer's hard drive capacity into separate
-areas for use.
-
-
-Two common partition are: the root partition (/), which is the starting
-point of the filesystem's directory hierarchy, and /boot, which contains
-all files necessary to start the operating system when the
-computer is first turned on.
-
-
-Because the effects of this process are usually irreversible, partitioning
-can be intimidating and stressful to the unexperienced. DiskDrake
-simplifies the process so that it need not be. Consult the documentation
-and take your time before proceeding."),
+ __("In this stage, you may choose what partition(s) use to install your
+Linux-Mandrake system."),
+
+#At this point, hard drive partitions must be defined. (Unless you
+#are overwriting a previous install of Linux and have already defined
+#your hard drive partitions as desired.) This operation consists of
+#logically dividing the computer's hard drive capacity into separate
+#areas for use.
+#
+#
+#Two common partition are: the root partition (/), which is the starting
+#point of the filesystem's directory hierarchy, and /boot, which contains
+#all files necessary to start the operating system when the
+#computer is first turned on.
+#
+#
+#Because the effects of this process are usually irreversible, partitioning
+#can be intimidating and stressful to the unexperienced. DiskDrake
+#simplifies the process so that it need not be. Consult the documentation
+#and take your time before proceeding."),
 
 formatPartitions =>
  __("Any partitions that have been newly defined must be formatted for
@@ -226,6 +229,7 @@ you must configure your video card and monitor. Most of these
 steps are automated, though, therefore your work may only consist
 of verifying what has been done and accept the settings :)
 
+
 When the configuration is over, X will be started (unless you
 ask DrakX not to) so that you can check and see if the
 settings suit you. If they don't, you can come back and
@@ -291,23 +295,26 @@ it on your system), as suggested by the installation guide.
 These are the options you will need to provide to the driver."),
 
 partitionDisks =>
- __("At this point, hard drive partitions must be defined. (Unless you
-are overwriting a previous install of Linux and have already defined
-your hard drive partitions as desired.) This operation consists of
-logically dividing the computer's hard drive capacity into separate
-areas for use.
-
-
-Two common partition are: the root partition (/), which is the starting
-point of the filesystem's directory hierarchy, and /boot, which contains
-all files necessary to start the operating system when the
-computer is first turned on.
-
-
-Because the effects of this process are usually irreversible, partitioning
-can be intimidating and stressful to the unexperienced. DiskDrake
-simplifies the process so that it need not be. Consult the documentation
-and take your time before proceeding."),
+ __("In this stage, you may choose what partition(s) use to install your
+Linux-Mandrake system."),
+
+#At this point, hard drive partitions must be defined. (Unless you
+#are overwriting a previous install of Linux and have already defined
+#your hard drive partitions as desired.) This operation consists of
+#logically dividing the computer's hard drive capacity into separate
+#areas for use.
+#
+#
+#Two common partition are: the root partition (/), which is the starting
+#point of the filesystem's directory hierarchy, and /boot, which contains
+#all files necessary to start the operating system when the
+#computer is first turned on.
+#
+#
+#Because the effects of this process are usually irreversible, partitioning
+#can be intimidating and stressful to the unexperienced. DiskDrake
+#simplifies the process so that it need not be. Consult the documentation
+#and take your time before proceeding."),
 
 formatPartitions =>
  __("Any partitions that have been newly defined must be formatted for
@@ -457,6 +464,7 @@ you must configure your video card and monitor. Most of these
 steps are automated, though, therefore your work may only consist
 of verifying what has been done and accept the settings :)
 
+
 When the configuration is over, X will be started (unless you
 ask DrakX not to) so that you can check and see if the
 settings suit you. If they don't, you can come back and
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e789293b6..dbd447232 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -63,6 +63,7 @@ my (%installSteps, %upgradeSteps, @orderedInstallSteps, @orderedUpgradeSteps);
 for (my $i = 0; $i < @installSteps; $i += 2) {
     my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] };
     $h{help}    = $help::steps{$installSteps[$i]} || __("Help");
+    $h{previous}= $installSteps[$i - 2] if $i >= 2;
     $h{next}    = $installSteps[$i + 2];
     $h{entered} = 0;
     $h{onError} = $installSteps[$i + 2 * $h{onError}];
@@ -379,6 +380,7 @@ sub addUser {
     $o->addUser;
 
     addToBeDone {
+	install_any::enableMD5($o->{prefix});
 	run_program::rooted($o->{prefix}, "pwconv") or log::l("pwconv failed"); #- use shadow passwords
     } 'doInstallStep';
 }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 3d00b7d2b..4d867ab4b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -259,3 +259,16 @@ sub write_ldsoconf {
 	print F "/usr/lib\n";
     }
 }
+
+sub enableMD5 {
+    my ($prefix) = @_;
+    local @ARGV = map { "$prefix/etc/pam.d/$_" } qw(login rlogin passwd);
+    local $^I = '';
+    while (<>) {
+	if (/^password.*pam_pwdb.so/) {
+	    /\s*shadow/ or s/$/ shadow/;
+	    /\s*md5/ or s/$/ md5/;
+	}
+	print;
+    }
+}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1d12eed53..e5368da7c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -713,8 +713,10 @@ Do you really want to quit now?"), 0);
     $o->ask_warn('',
 _("Congratulations, installation is complete.
 Remove the boot media and press return to reboot.
+
 For information on fixes which are available for this release of Linux-Mandrake,
 consult the Errata available from http://www.linux-mandrake.com/.
+
 Information on configuring your system is available in the post
 install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone;
 }
@@ -745,7 +747,7 @@ sub load_module {
 
     my @names = modparm::get_options_name($m);
 
-    if ((@names != 0) && $o->ask_from_list('',
+    if ((@names != 0) && $o->ask_from_list_('',
 _("In some cases, the %s driver needs to have extra information to work
 properly, although it normally works fine without. Would you like to specify
 extra options for it or allow the driver to probe your machine for the
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 46fab9f25..f349599f5 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -324,6 +324,14 @@ sub _create_window($$) {
     $w->signal_connect("delete_event" => sub { $o->{retval} = undef; Gtk->main_quit });
     $w->set_uposition(@{$my_gtk::force_position || $o->{force_position}}) if $my_gtk::force_position || $o->{force_position};
 
+    $w->signal_connect("key_press_event" => sub {
+	my $d = ${{ 65481 => 'next',
+		    65480 => 'previous' }}{$_[1]->{keyval}} or return;
+	my $s = $::o->{step};
+	do { $s = $::o->{steps}{$s}{$d} } until !$s || $::o->{steps}{$s}{reachable};
+	$::setstep && $s and die "setstep $s\n";
+    });
+
     $w->signal_connect(size_allocate => sub {
 	my ($wi, $he) = @{$_[1]}[2,3];
 	my ($X, $Y, $Wi, $He) = @{$my_gtk::force_center || $o->{force_center}};