no_comment

7 files changed, 17 insertions, 9 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index dbacd6e12..52731da54 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -128,6 +128,7 @@ sub setPackages($) {
 	push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP();
 	push @{$o->{base}}, "kernel-pcmcia-cs" if $o->{pcmcia};
 	push @{$o->{base}}, "raidtools" if !is_empty_hash_ref($o->{raid});
+	push @{$o->{base}}, "nfs-utils-clients" if $o->{method} eq "nfs";
 
 	grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages";
     } else {
@@ -394,7 +395,11 @@ sub g_auto_install(;$) {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade X manualFstab nomouseprobe); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade manualFstab nomouseprobe); #- TODO modules bootloader 
+
+    my $card = $::o->{X}{card};
+    $o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
+    $o->{X}{card}{resolution_wanted} = join "x", @{$card->{depth}{$card->{default_depth}}[0]};
 
 #-    local $o->{partitioning}{clearall} = 1;
 
@@ -451,7 +456,7 @@ sub fsck_option() {
 sub install_urpmi {
     my ($prefix, $method) = @_;
 
-    (my $name = _("installation_cd")) =~ s/\s/_/g; #- in case translators are too good :-/
+    (my $name = _("installation")) =~ s/\s/_/g; #- in case translators are too good :-/
 
     my $f = "$prefix/etc/urpmi/hdlist.$name";
     {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 1de040a13..509d2b9ab 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -528,6 +528,7 @@ sub miscellaneous {
         TYPE => $o->{installClass},
         SECURITY => $o->{security},
     });
+    $ENV{SECURE_LEVEL} = $o->{security};
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index a9ee6a7b1..93e025811 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -143,7 +143,7 @@ sub setup($) {
 sub write($$) {
     my ($prefix, $keyboard) = @_;
 
-    setVarsInSh("$prefix/etc/sysconfig/keyboard", { KEYTABLE => kmap($keyboard) });
+    setVarsInSh("$prefix/etc/sysconfig/keyboard", { KEYTABLE => kmap($keyboard), BACKSPACE => "Delete" });
 
     run_program::rooted($prefix, "dumpkeys > /etc/sysconfig/console/default.kmap") or die "dumpkeys failed";
 }
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 99ef6f7b0..ba784340c 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -469,7 +469,6 @@ sub _ask_from_list {
 	$list->moveto($_[0], 0, 0.5, 0);
     };
 
-
     ref $title && !@okcancel ?
       $list->signal_connect(button_release_event => $leave) :
       $list->signal_connect(button_press_event => sub { &$leave if $_[1]{type} =~ /^2/ });
@@ -524,10 +523,11 @@ sub _ask_from_list {
 		  ));
 
     $o->sync; #- otherwise the moveto is not done
-    map_index {
+    my $toselect; map_index {
 	$list->append($_);
-	&$select($::i) if $def && $_ eq $def;
+	$toselect = $::i if $def && $_ eq $def;
     } @$l;
+    &$select($toselect);
 
     $list->grab_focus;
 }
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 83831d28f..92cb9eb2a 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -567,6 +567,7 @@ sub load($$;$) {
 
     @{$hd}{@fields2save} = @$h;
 
+    delete @$_{qw(isMounted isFormatted notFormatted toFormat toFormatUnsure)} foreach get_normal_parts($hd);
     $hd->{isDirty} = $hd->{needKernelReread} = 1;
 }
 
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 8bce51b15..069ac7346 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -103,9 +103,9 @@ sub write($) {
     my ($raid, $file) = @_;
     local *F;
     local $\ = "\n";
+    open F, ">$file" or die _("Can't write file $file");
 
     foreach (grep {$_} @$raid) {
-	open F, ">$file" or die _("Can't write file $file");
 	print F <<"EOF";
 raiddev       /dev/$_->{device}
 raid-level    $_->{level}
@@ -122,6 +122,7 @@ EOF
 
 sub make($$) {
     my ($raid, $part) = @_;
+    is($_) and make($raid, $_) foreach @{$part->{disks}};
     my $dev = devices::make($part->{device});
     eval { commands::modprobe(module($part)) };
     run_program::run("raidstop", $dev);
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index cbc589287..10ea6164c 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -311,8 +311,6 @@ kmol                                          82     0    60
 kmpg                                          82     0    60
 knetload                                      82     0    60
 knewmail                                      82     0    60
-knfsd                                         15     0    13
-knfsd-clients                                 15     0    13
 knsbookmark                                   82     0    60
 korganizer                                    81     0    59
 kover                                         82     0    60
@@ -506,6 +504,8 @@ netscape-communicator                         90     0    73
 netscape-navigator                            60     0    54
 newt                                          20     0    75
 newt-devel                                     5     0    75
+nfs-utils                                     15    80    13
+nfs-utils-clients                             15    80    53
 nmh                                            0     0     0
 npxanim                                       82     0    61
 nscd                                           1     0     0