no_comment

3 files changed, 8 insertions, 9 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5dfae42b1..ab28caad7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -279,9 +279,10 @@ $o = $::o = {
 #		   { mntpoint => "/usr",  size => 400 << 11, type => 0x83, growable => 1 }, 
 #	     ],
     shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ],
-    lang         => 'fr_FR',
+    lang         => 'us',
     isUpgrade    => 0,
-    installClass => 'expert',
+    installClass => "beginner",
+
     timezone => {
                    timezone => "Europe/Paris",
                    GMT      => 1,
@@ -321,8 +322,6 @@ $o = $::o = {
     steps        => \%installSteps,        
     orderedSteps => \@orderedInstallSteps, 
 
-    installClass => "expert",
-
     base => [ qw(basesystem initscripts console-tools mkbootdisk anacron rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time timeconfig tmpwatch util-linux vim-minimal vixie-cron which cpio) ],
 # for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
 #    intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8da801a2f..1cef55e77 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -142,7 +142,7 @@ sub configureNetwork($) {
 	$o->setup_thiskind('net', !$::expert, 1);
 	my @l = detect_devices::getNet() or die _("no network card found");
 
-	my $last; foreach ($::expert ? @l : $l[0]) {
+	my $last; foreach ($::beginner ? $l[0] : @l) {
 	    my $intf = network::findIntf($o->{intf} ||= [], $_);
 	    add2hash($intf, $last);
 	    add2hash($intf, { NETMASK => '255.255.255.0' });
@@ -479,7 +479,7 @@ lilo on your system, or another operating system removes lilo, or lilo doesn't
 work with your hardware configuration. A custom bootdisk can also be used with
 the Mandrake rescue image, making it much easier to recover from severe system
 failures. Would you like to create a bootdisk for your system?"), !$o->{mkbootdisk}) or return;
-	$o->{mkbootdisk} = $l[1] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
+	$o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
     } else {
 	@l or die _("Sorry, no floppy drive available");
 
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index d7a5c1eb8..7de6917a2 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -109,10 +109,10 @@ sub text2lang {
 }
 
 sub set {
-    my $lang = shift;
+    my ($lang) = @_;
 
     if ($lang) {
-	$ENV{LC_ALL}    = $lang;                
+	$ENV{LC_ALL}    = $lang;
 	$ENV{LANG}      = $languages{$lang}[2]; 
 	$ENV{LANGUAGES} = $languages{$lang}[3]; 
 	if (my $f = $languages{$lang}[1]) { load_font($f) }
@@ -158,7 +158,7 @@ sub load_font {
     my $fontSet = "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1";
 
     if (my $c = $charsets{$charset}) {
-	log::l("loading " . $c . " font");
+	log::l("loading $charset font");
         $fontFile = $c->[0];
 	$fontSet  = $c->[2]; 
     }