metter arch

6 files changed, 347 insertions, 272 deletions

diff --git a/perl-install/install2 b/perl-install/install2
index 9b5aff1f2..2498d14dc 100755
--- a/perl-install/install2
+++ b/perl-install/install2
@@ -24,6 +24,7 @@ use lib qw(/usr/bin/perl-install . c c/blib/arch);
 use install2;
 
 $::testing = $ENV{PERL_INSTALL_TEST};
+$::isStandalone = 0;
 
 install2::main(@ARGV);
  
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 1e902d1aa..24d0ed845 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -237,23 +237,38 @@ my @serverPartitioning = (
 		     { mntpoint => "swap",  size =>  64 << 11, type => 0x82 }
 );
 
-#all the fields can be also present in $o, (in that case it overides)
-my $default = {
+#-#######################################################################################
+#-$O
+#-the big struct which contain, well everything (globals + the interactive methods ...)
+#-if you want to do a kickstart file, you just have to add all the required fields (see for example
+#-the variable $default)
+#-#######################################################################################
+$o = $::o = { 
     bootloader => { onmbr => 1, linear => 0 },
     autoSCSI   => 0,
     mkbootdisk => "fd0", # no mkbootdisk if 0 or undef,   find a floppy with 1
     packages   => [ qw() ],
     partitioning => { clearall => $::testing, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0 },
-    partitions => [
-		   { mntpoint => "/boot", size =>  16 << 11, type => 0x83 }, 
-		   { mntpoint => "/",     size => 300 << 11, type => 0x83 }, 
-		   { mntpoint => "swap",  size =>  64 << 11, type => 0x82 },
+#    partitions => [
+#		      { mntpoint => "/boot", size =>  16 << 11, type => 0x83 }, 
+#		      { mntpoint => "/",     size => 256 << 11, type => 0x83 }, 
+#		      { mntpoint => "/usr",  size => 512 << 11, type => 0x83, growable => 1 }, 
+#		      { mntpoint => "/var",  size => 256 << 11, type => 0x83 }, 
+#		      { mntpoint => "/home", size => 512 << 11, type => 0x83, growable => 1 }, 
+#		      { mntpoint => "swap",  size =>  64 << 11, type => 0x82 }
+#		    { mntpoint => "/boot", size =>  16 << 11, type => 0x83 }, 
+#		    { mntpoint => "/",     size => 300 << 11, type => 0x83 }, 
+#		    { mntpoint => "swap",  size =>  64 << 11, type => 0x82 },
 #		   { mntpoint => "/usr",  size => 400 << 11, type => 0x83, growable => 1 }, 
-	     ],
+#	     ],
     shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ],
     lang         => 'us',
     isUpgrade    => 0,
     installClass => 'beginner',
+    timezone => {
+                   timezone => "Europe/Paris",
+                   GMT      => 1,
+                },
     printer => { 
                  complete => 0,
                  str_type => $printer::printer_type[0],
@@ -280,20 +295,11 @@ my $default = {
                  SMBPASSWD => "passowrd",
                  SMBWORKGROUP => "AS3",
                },
+    superuser => { password => 'a', shell => '/bin/bash', realname => 'God' },
+    user => { name => 'foo', password => 'bar', home => '/home/foo', shell => '/bin/bash', realname => 'really, it is foo' },
     
 #    keyboard => 'de',
 #    display => "192.168.1.9:0",
-};
-
-#-#######################################################################################
-#-$O
-#-the big struct which contain, well everything (globals + the interactive methods ...)
-#-if you want to do a kickstart file, you just have to add all the required fields (see for example
-#-the variable $default)
-#-#######################################################################################
-$o = $::o = { 
-
-    default      => $default,              
     steps        => \%installSteps,        
     orderedSteps => \@orderedInstallSteps, 
 
@@ -301,8 +307,6 @@ $o = $::o = {
 
     base => [ qw(basesystem initscripts console-tools mkbootdisk linuxconf anacron linux_logo rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup setuptool filesystem MAKEDEV SysVinit ash at authconfig bash bdflush binutils console-tools crontabs dev e2fsprogs ed etcskel file fileutils findutils getty_ps gpm 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
-#    user => { name => 'foo', password => 'bar', home => '/home/foo', shell => '/bin/bash', realname => 'really, it is foo' },
-#    superuser => { password => 'a', shell => '/bin/bash', realname => 'God' },
 #    intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
 
 #step : the current one
@@ -329,7 +333,7 @@ sub selectLanguage {
 
     addToBeDone {
 	unless ($o->{isUpgrade}) {
-	        lang::write($o->{prefix});
+	    lang::write($o->{prefix});
             keyboard::write($o->{prefix}, $o->{keyboard});
 	}
     } 'doInstallStep';
@@ -349,7 +353,7 @@ sub selectKeyboard {
 
 #------------------------------------------------------------------------------
 sub selectPath {
-    $o->{isUpgrade}    = $o->selectInstallOrUpgrade;
+    $o->selectPath;
 
     $o->{steps}        = $o->{isUpgrade} ? \%upgradeSteps : \%installSteps;
     $o->{orderedSteps} = $o->{isUpgrade} ? \@orderedUpgradeSteps : \@orderedInstallSteps;
@@ -357,7 +361,7 @@ sub selectPath {
 
 #------------------------------------------------------------------------------
 sub selectInstallClass {
-    $o->{installClass} = $o->selectInstallClass(@install_classes);
+    $o->selectInstallClass(@install_classes);
 
     $::expert = $o->{installClass} eq "expert";
 }
@@ -374,7 +378,7 @@ sub setupSCSI {
 #PADTODO
 sub partitionDisks {
     $o->{drives} = [ detect_devices::hds() ];
-    $o->{hds} = catch_cdie { fsedit::hds($o->{drives}, $o->{default}{partitioning}) }
+    $o->{hds} = catch_cdie { fsedit::hds($o->{drives}, $o->{partitioning}) }
       sub {
 	  $o->ask_warn(_("Error"), 
 _("I can't read your partition table, it's too corrupted for me :(
@@ -390,7 +394,7 @@ I'll try to go on blanking bad partitions"));
     }
 
     unless ($o->{isUpgrade}) {
-	eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if $o->{default}{partitioning}{auto_allocate};
+	eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if $o->{partitioning}{auto_allocate};
 	$o->doPartitionDisks($o->{hds});
 
 	unless ($::testing) {
@@ -447,6 +451,7 @@ sub configureTimezone {
     my ($clicked) = $_[0];
     my $f = "$o->{prefix}/etc/sysconfig/clock";
     return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked;
+
     $o->timeConfig($f);
 }
 #------------------------------------------------------------------------------
@@ -540,6 +545,8 @@ sub main {
 	    $o->{steps}{first} = shift;
 	} elsif (/--expert/) {
 	    $::expert = 1;
+	} else {
+	    $::expert = 0;
 	}
        
     }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ff0a674a5..e28bf4e59 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -77,7 +77,7 @@ sub mouse_detect() {
 
 sub shells($) {
     my ($o) = @_;
-    my @l = grep { -x "$o->{prefix}$_" } @{$o->{default}{shells}};
+    my @l = grep { -x "$o->{prefix}$_" } @{$o->{shells}};
     @l ? @l : "/bin/bash";
 }
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 1b1c59f5f..ff5ce02ff 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -3,6 +3,9 @@ package install_steps;
 use diagnostics;
 use strict;
 
+#-######################################################################################
+#- misc imports
+#-######################################################################################
 use common qw(:file :system :common);
 use install_any qw(:all);
 use partition_table qw(:types);
@@ -29,17 +32,18 @@ my $o;
 1;
 
 
+#-######################################################################################
+#- misc functions
+#-######################################################################################
 sub new($$) {
     my ($type, $o_) = @_;
 
     $o = bless $o_, ref $type || $type;
 }
 
-sub default {
-    my ($o, $field) = @_;
-    $o->{$field} || $o->{default}{$field};
-}
-
+#-######################################################################################
+#- In/Out Steps Functions
+#-######################################################################################
 sub enteringStep($$) {
     my ($o, $step) = @_;
     log::l("starting step `$step'");
@@ -77,46 +81,48 @@ so continue at your own risk :("), $@ ]) if $@;
 
 sub errorInStep($$) {}
 
-sub chooseLanguage($) {
-    $o->default("lang");
-}
-sub chooseKeyboard($) {
-    $o->default("keyboard");
-}
-sub choosePrinter($) {
-    $o->default("printer");
-}
 
+#-######################################################################################
+#- Steps Functions
+#-######################################################################################
 
-sub selectInstallOrUpgrade($) {
-    $o->default("isUpgrade") || 0;
-}
-sub selectInstallClass($@) {
-    $o->default("installClass") || $_[1];
+#------------------------------------------------------------------------------
+sub selectLanguage {
+    $o->{keyboard} ||= keyboard::lang2keyboard($o->{lang});
+    selectKeyboard($o);
 }
-sub setupSCSI {
-    modules::load_thiskind('scsi');
-}
-
+#------------------------------------------------------------------------------
+sub selectKeyboard { keyboard::setup($o->{keyboard}) }
+#------------------------------------------------------------------------------
+sub selectPath {}
+#------------------------------------------------------------------------------
+sub selectInstallClass($@) {}
+#------------------------------------------------------------------------------
+sub setupSCSI { modules::load_thiskind('scsi') }
+#------------------------------------------------------------------------------
 sub doPartitionDisks($$) {
     my ($o, $hds) = @_;
-    fsedit::auto_allocate($hds, $o->default("partitions"));
+    fsedit::auto_allocate($hds, $o->{partitions});
 }
+
+#------------------------------------------------------------------------------
 sub rebootNeeded($) {
     my ($o) = @_;
     log::l("Rebooting...");
     exit "true";
 }
 
+#------------------------------------------------------------------------------
 sub choosePartitionsToFormat($$) {
     my ($o, $fstab) = @_;
 
     foreach (@$fstab) { 
 	$_->{toFormat} = ($_->{mntpoint} && isExt2($_) || isSwap($_)) &&
-	  ($_->{notFormatted} || $o->{default}{partitioning}{autoformat});
+	  ($_->{notFormatted} || $o->{partitioning}{autoformat});
     }
 }
 
+#------------------------------------------------------------------------------
 sub formatPartitions {
     my $o = shift;
     foreach (@_) {
@@ -124,10 +130,12 @@ sub formatPartitions {
     }
 }
 
+#------------------------------------------------------------------------------
 sub choosePackages($$$) {
     my ($o, $packages, $compss) = @_;
 }
 
+#------------------------------------------------------------------------------
 sub beforeInstallPackages {
     my ($o) = @_;
 
@@ -150,12 +158,14 @@ sub afterInstallPackages($) {
 #    configPCMCIA($o->{rootPath}, $o->{pcmcia});
 }
 
+#------------------------------------------------------------------------------
 sub mouseConfig($) { 
     my ($o) = @_;
     setVarsInSh("$o->{prefix}/etc/sysconfig/mouse", $o->{mouse});
     symlink $o->{mouse}{DEVICE}, "$o->{prefix}/dev/mouse" or log::l("creating /dev/mouse symlink failed");
 }
 
+#------------------------------------------------------------------------------
 sub configureNetwork($) {
     my ($o) = @_;
     my $etc = "$o->{prefix}/etc";
@@ -171,9 +181,10 @@ sub configureNetwork($) {
     #res_init();		# reinit the resolver so DNS changes take affect     
 }
 
+#------------------------------------------------------------------------------
 sub timeConfig {
     my ($o, $f) = @_;
-    my $t = $o->default("timezone");
+    my $t = $o->{timezone};
 
     setVarsInSh($f, { 
 	ZONE => $t->{timezone},
@@ -182,17 +193,20 @@ sub timeConfig {
     });
 }
 
+#------------------------------------------------------------------------------
 sub servicesConfig {}
+#------------------------------------------------------------------------------
 sub printerConfig {
     my($o) = @_;
-    my $printer = $o->default("printer");
     if ($o->{printer}{complete}) {
+
 	pkgs::select($o->{packages}, $o->{packages}{'rhs-printfilters'});
 	$o->installPackages($o->{packages});
-	printer::configure_queue($printer) if $o->{printer}{complete};
+
+	printer::configure_queue($o->{printer});
     }
 }
-
+#------------------------------------------------------------------------------
 sub setRootPassword($) {
     my ($o) = @_;
     my %u = %{$o->{superuser}};
@@ -216,6 +230,7 @@ sub setRootPassword($) {
     }
 }
 
+#------------------------------------------------------------------------------
 sub addUser($) {
     my ($o) = @_;
     my %u = %{$o->{user}};
@@ -249,6 +264,7 @@ sub addUser($) {
     commands::chown_("-r", "$u{uid}.$u{gid}", "$p$u{home}");
 }
 
+#------------------------------------------------------------------------------
 sub createBootdisk($) {
     my $dev = $o->default("mkbootdisk") or return;
 
@@ -263,14 +279,17 @@ sub createBootdisk($) {
     $o->{mkbootdisk} = $dev;
 }
 
+#------------------------------------------------------------------------------
 sub setupBootloader($) {
     my ($o) = @_;
     my $versionString = versionString();
-    lilo::install($o->{prefix}, $o->{hds}, $o->{fstab}, $versionString, $o->default("bootloader"));
+    lilo::install($o->{prefix}, $o->{hds}, $o->{fstab}, $versionString, $o->{bootloader});
 }
 
+#------------------------------------------------------------------------------
 sub setupXfree {
     my ($o) = @_;
 }
 
+#------------------------------------------------------------------------------
 sub exitInstall {}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a33768e21..11f782d8f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -7,6 +7,9 @@ use vars qw(@ISA);
 
 @ISA = qw(install_steps);
 
+#-######################################################################################
+#- misc imports
+#-######################################################################################
 use common qw(:common);
 use partition_table qw(:types);
 use install_steps;
@@ -22,55 +25,75 @@ use log;
 use printer;
 1;
 
+#-######################################################################################
+#- misc functions
+#-######################################################################################
 sub errorInStep($$) {
     my ($o, $err) = @_;
     $o->ask_warn(_("Error"), [ _("An error occurred"), $err ]);
 }
 
 
-sub chooseLanguage($) {
+#-######################################################################################
+#- Steps Functions
+#-######################################################################################
+#------------------------------------------------------------------------------
+sub selectLanguage($) {
     my ($o) = @_;
-    lang::text2lang($o->ask_from_list("Language",
-		__("Which language do you want?"), # the translation may be used for the help
-                [ lang::list() ], 
-		lang::lang2text($o->default("lang"))));
+    $o->{lang} =
+      lang::text2lang($o->ask_from_list("Language",
+					__("Which language do you want?"), 
+					# the translation may be used for the help
+					[ lang::list() ], 
+					lang::lang2text($o->{lang})));
+    install_steps::selectLanguage($o);
 }
-
-sub chooseKeyboard($) {
+#------------------------------------------------------------------------------
+sub selectKeyboard($) {
     my ($o) = @_;
-    keyboard::text2keyboard($o->ask_from_list_("Keyboard",
-               _("Which keyboard do you have?"),
-               [ keyboard::list() ],
-               keyboard::keyboard2text($o->default("keyboard"))));
+    $o->{keyboard} = 
+      keyboard::text2keyboard($o->ask_from_list_("Keyboard",
+						 _("Which keyboard do you have?"),
+						 [ keyboard::list() ],
+						 keyboard::keyboard2text($o->{keyboard})));
+    install_steps::selectKeyboard($o);
 }
-
-sub selectInstallOrUpgrade($) {
+#------------------------------------------------------------------------------
+sub selectPath($) {
     my ($o) = @_;
-    $o->ask_from_list_(_("Install/Upgrade"), 
-		       _("Is this an install or an upgrade?"),
-		       [ __("Install"), __("Upgrade") ], 
-		       $o->default("isUpgrade") ? "Upgrade" : "Install") eq "Upgrade";
-}
+    $o->{isUpgrade} =
+      $o->ask_from_list_(_("Install/Upgrade"), 
+			 _("Is this an install or an upgrade?"),
+			 [ __("Install"), __("Upgrade") ], 
+			 $o->{isUpgrade} ? "Upgrade" : "Install") eq "Upgrade";
+    install_steps::selectPath($o);
 
+}
+#------------------------------------------------------------------------------
 sub selectInstallClass($@) {
     my ($o, @classes) = @_;
-    $o->ask_from_list_(_("Install Class"),
-		       _("What type of user will you have?"),
-		       [ @classes ], $o->default("installClass"));
+    $o->{installClass} =
+      $o->ask_from_list_(_("Install Class"),
+			 _("What type of user will you have?"),
+			 [ @classes ], $o->{installClass});
+    install_steps::selectInstallClass($o);
 }
 
+#------------------------------------------------------------------------------
 sub setupSCSI { setup_thiskind($_[0], 'scsi', $_[1]) }
-
+#------------------------------------------------------------------------------
 sub rebootNeeded($) {
     my ($o) = @_;
     $o->ask_warn('', _("You need to reboot for the partition table modifications to take place"));
-    $o->SUPER::rebootNeeded;
+
+    install_steps::rebootNeeded($o);
 }
+#------------------------------------------------------------------------------
 
 sub choosePartitionsToFormat($$) {
     my ($o, $fstab) = @_;
 
-    $o->SUPER::choosePartitionsToFormat($fstab);
+    install_steps::choosePartitionsToFormat($o, $fstab);
 
     my @l = grep { $_->{mntpoint} && isExt2($_) || isSwap($_) } @$fstab;
     my @r = $o->ask_many_from_list_ref('', _("Choose the partitions you want to format"), 
@@ -124,26 +147,25 @@ sub configureNetwork($) {
 	    $o->configureNetworkIntf($intf);
 	    $last = $intf;
 	}
-#	 { 
-#	     my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain..."));
-#	     network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf});
-#	 }
+	#	 { 
+	#	     my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain..."));
+	#	     network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf});
+	#	 }
 	$o->configureNetworkNet($o->{netc} ||= {}, @l);
     }
-    $o->SUPER::configureNetwork;
+    install_steps::configureNetwork($o);
 }
 	
 sub timeConfig {
     my ($o, $f) = @_;
-    add2hash($o->{timezone} ||= {}, $o->default("timezone"));
 
     $o->{timezone}{GMT} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{GMT});
     $o->{timezone}{timezone} = $o->ask_from_list('', _("In which timezone are you"), [ install_any::getTimeZones() ], $o->{timezone}{timezone});
-    $o->SUPER::timeConfig($f);
+    install_steps::timeConfig($o,$f);
 }
 
 sub printerConfig($) {
-    my($o) = @_;
+    my ($o) = @_;
     $o->{printer}{want} = 
       $o->ask_yesorno(_("Printer"),
 		      _("Would you like to configure a printer?"),
@@ -151,13 +173,6 @@ sub printerConfig($) {
     return if !$o->{printer}{want};
 
     $o->{printer}{complete} = 0;
-    #default value
-    foreach (keys %printer::fields) {
-	foreach (@{$printer::fields{$_}}) {
-	    $o->{printer}{$_} ||= $o->{default}{printer}{$_};
-	}
-	
-    }
     if ($::expert) {
 	#std info
 	#Don't wait, if the user enter something, you must remember it
@@ -188,7 +203,7 @@ sub printerConfig($) {
 	my @port = ();
 	foreach ("lp0", "lp1", "lp2") {
 	    local *LP;
-	    push @port, "/dev/$_" if open LP, ">/dev/$_";
+	    push @port, "/dev/$_" if open LP, ">/dev/$_"
 	}
 	eval { modules::unload("lp") };
 	
@@ -196,9 +211,7 @@ sub printerConfig($) {
 (note that /dev/lp0 is equivalent to LPT1:)?\n");
 	$string .= _("I detect :");
 	$string .= join(", ", @port);
-	$o->{printer}{DEVICE}    ||= $port[0];
-	$o->{printer}{DEVICE}    ||= $o->{default}{printer}{DEVICE};
-	
+	$o->{printer}{DEVICE}    = $port[0] if $port[0];
 	
 	return if !$o->ask_from_entries_ref(_("Local Printer Device"),
 					    $string,
@@ -209,46 +222,48 @@ sub printerConfig($) {
 
     } elsif ($o->{printer}{TYPE} eq "REMOTE") {
 	return if !$o->ask_from_entries_ref(_("Remote lpd Printer Options"), 
-				 _("To use a remote lpd print queue, you need to supply 
+					    _("To use a remote lpd print queue, you need to supply 
 the hostname of the printer server and the queue name 
 on that server which jobs should be placed in."),
-				 [_("Remote hostname:"), _("Remote queue:")],
-				 [\$o->{printer}{REMOTEHOST}, \$o->{printer}{REMOTEQUEUE}],
-				);
+					    [_("Remote hostname:"), _("Remote queue:")],
+					    [\$o->{printer}{REMOTEHOST}, \$o->{printer}{REMOTEQUEUE}],
+					   );
 	
     } elsif ($o->{printer}{TYPE} eq "SMB") {
 	return if !$o->ask_from_entries_ref(_("SMB/Windows 95/NT Printer Options"),
-				 _("To print to a SMB printer, you need to provide the 
+					    _("To print to a SMB printer, you need to provide the 
 SMB host name (this is not always the same as the machines 
 TCP/IP hostname) and possibly the IP address of the print server, as 
 well as the share name for the printer you wish to access and any 
 applicable user name, password, and workgroup information."),
-				 [_("SMB server host:"), _("SMB server IP:"),
-				  _("Share name:"), _("User name:"), _("Password:"),
-				  _("Workgroup:")],
-				 [\$o->{printer}{SMBHOST}, \$o->{printer}{SMBHOSTIP},
-				  \$o->{printer}{SMBSHARE}, \$o->{printer}{SMBUSER},
-				  \$o->{printer}{SMBPASSWD}, \$o->{printer}{SMBWORKGROUP}
-				 ]
-				);
-    } elsif ($o->{printer}{TYPE} eq "NCP") {
+					    [_("SMB server host:"), _("SMB server IP:"),
+					     _("Share name:"), _("User name:"), _("Password:"),
+					     _("Workgroup:")],
+					    [\$o->{printer}{SMBHOST}, \$o->{printer}{SMBHOSTIP},
+					     \$o->{printer}{SMBSHARE}, \$o->{printer}{SMBUSER},
+					     \$o->{printer}{SMBPASSWD}, \$o->{printer}{SMBWORKGROUP}
+					    ]
+					   );
+    } else {#($o->{printer}{TYPE} eq "NCP") {
 	return if !$o->ask_from_entries_ref(_("NetWare Printer Options"),
-				 _("To print to a NetWare printer, you need to provide the 
+					    _("To print to a NetWare printer, you need to provide the 
 NetWare print server name (this is not always the same as the machines 
 TCP/IP hostname) as well as the print queue name for the printer you 
 wish to access and any applicable user name and password."),
-				 [_("Printer Server:"), _("Print Queue Name:"), 
-				  _("User name:"), _("Password:")],
-				 [\$o->{printer}{NCPHOST}, \$o->{printer}{NCPQUEUE},
-				  \$o->{printer}{NCPUSER}, \$o->{printer}{NCPPASSWD}],
-				);
+					    [_("Printer Server:"), _("Print Queue Name:"), 
+					     _("User name:"), _("Password:")],
+					    [\$o->{printer}{NCPHOST}, \$o->{printer}{NCPQUEUE},
+					     \$o->{printer}{NCPUSER}, \$o->{printer}{NCPPASSWD}],
+					   );
     }
     
     unless (($::testing)) {
 	printer::set_prefix($o->{prefix});
 	pkgs::select($o->{packages}, $o->{packages}{'rhs-printfilters'});
 	$o->installPackages($o->{packages});
+
     }
+
     printer::read_printer_db();
     my @entries_db_short     = sort keys %printer::thedb;
     my @entry_db_description = map { $printer::thedb{$_}{DESCR} } @entries_db_short;
@@ -280,23 +295,20 @@ wish to access and any applicable user name and password."),
     my @res = map { "${$_}{XDPI}x${$_}{YDPI}" } @list_res;
     if (@list_res) {
 	$o->{printer}{RESOLUTION} = $o->ask_from_list_(_("Resolution"),
-						   _("Resolution"),
-						   \@res,
-						   $o->{printer}{RESOLUTION},
-						   );
+						       _("Resolution"),
+						       \@res,
+						       $o->{printer}{RESOLUTION},
+						      );
     } else {
 	$o->{printer}{RESOLUTION} = "Default";
     }
 
-    
-    #Fix ster stepping
-    # MAJOR HACK 
-    # if the printer is an HP, let's do stairstep correction 
     $o->{printer}{CRLF} = $db_entry{DESCR} =~ /HP/;
     $o->{printer}{CRLF}= $o->ask_yesorno(_("CRLF"),
 					 _("Fix stair-stepping of text?"),
 					 $o->{printer}{CRLF});
 
+
     #color_depth
     my @list_col      = @{$db_entry{BITSPERPIXEL}};
     my @col           = map { "$_->{DEPTH} $_->{DESCR}" } @list_col;
@@ -312,7 +324,7 @@ wish to access and any applicable user name and password."),
 			     _("You may now configure the uniprint options for this printer."),
 			     \@col,
 			     $depth_to_col{$o->{printer}{BITSPERPIXEL}},
-			     )};
+			    )};
 	    
 	} else {
 	    $o->{printer}{BITSPERPIXEL} = 
@@ -321,13 +333,14 @@ wish to access and any applicable user name and password."),
 			     _("You may now configure the color options for this printer."),
 			     \@col,
 			     $depth_to_col{$o->{printer}{BITSPERPIXEL}},
-			     )};
+			    )};
 	}
     } else {
-	$o->{default}{printer}{BITSPERPIXEL} = "Default";
+	$o->{printer}{BITSPERPIXEL} = "Default";
     }
     $o->{printer}{complete} = 1;
-    $o->SUPER::printerConfig;
+
+    install_steps::printerConfig($o);
 }
 
 
@@ -337,25 +350,24 @@ sub createBootdisk {
  
     if ($first_time || @l == 1) {
 	$o->ask_yesorno('',
- _("A custom bootdisk provides a way of booting into your Linux system without
+			_("A custom bootdisk provides a way of booting into your Linux system without
 depending on the normal bootloader. This is useful if you don't want to install
 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->default("mkbootdisk")) or return;
+failures. Would you like to create a bootdisk for your system?"), !$o->{mkbootdisk}) or return;
 
-	$o->{mkbootdisk} = $o->default("mkbootdisk") || 1;
     } else {
 	@l or die _("Sorry, no floppy drive available");
 
 	$o->{mkbootdisk} = $o->ask_from_list('', 
-_("Choose the floppy drive you want to use to make the bootdisk"), 
-					     \@l, $o->default("mkbootdisk"));
+					     _("Choose the floppy drive you want to use to make the bootdisk"), 
+					     \@l, $o->{mkbootdisk});
     }
 
     $o->ask_warn('', _("Insert a floppy in drive %s", $o->{mkbootdisk}));
     my $w = $o->wait_message('', _("Creating bootdisk"));
-    $o->SUPER::createBootdisk;
+    install_steps::createBootdisk($o);
 }
 
 sub setupBootloader($) {
@@ -366,15 +378,15 @@ sub setupBootloader($) {
       $o->ask_from_list_(_("Lilo Installation"), 
 			 _("Where do you want to install the bootloader?"), 
 			 \@l, 
-			 $l[!$o->default("bootloader")->{onmbr}]
+			 $l[!$o->{bootloader}{onmbr}]
 			) eq $l[0];
-    $o->SUPER::setupBootloader;
+    install_steps::setupBootloader($o);
 }
 
 sub exitInstall { 
     my ($o) = @_;
     $o->ask_warn('',
-_("Congratulations, installation is complete.
+		 _("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/.
@@ -391,19 +403,19 @@ sub loadModule {
 			      [ modules::text_of_type($type) ]) or return;
     my $m = modules::text2driver($l);
     if ($o->ask_from_list('', 
-_("In some cases, the %s driver needs to have extra information to work
+			  _("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
 information it needs? Occasionally, probing will hang a computer, but it should
 not cause any damage.", $l),
 			  [ __("Autoprobe"), __("Specify options") ], "Autoprobe") ne "Autoprobe") {
 	@options = split ' ',
-	                 $o->ask_from_entry('',
-_("Here must give the different options for the module %s.
+	  $o->ask_from_entry('',
+			     _("Here must give the different options for the module %s.
 Options are in format ``name=value name2=value2 ...''.
 For example you can have ``io=0x300 irq=7''", $l),
-					    _("Module options:"),
-					   );
+			     _("Module options:"),
+			    );
     }
     modules::load($m, $type, @options);
     $l, $m;
@@ -413,11 +425,11 @@ sub load_thiskind {
     my ($o, $type) = @_;
     my $w;
     modules::load_thiskind($type, sub { 
-        $w = $o->wait_message('', 
-			      [ _("Installing driver for %s card %s", $type, $_->[0]),
-				$o->{installClass} ne "beginner" ? _("(module %s)", $_->[1]) : () 
-			      ]);
-    });
+			       $w = $o->wait_message('', 
+						     [ _("Installing driver for %s card %s", $type, $_->[0]),
+						       $o->{installClass} ne "beginner" ? _("(module %s)", $_->[1]) : () 
+						     ]);
+			   });
 }
 
 sub setup_thiskind {
@@ -430,7 +442,7 @@ sub setup_thiskind {
 	  $o->ask_yesorno('', 
 			  [ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type),
 			    _("Do you have another one?") ], "No") :
-	  $o->ask_yesorno('', _("Do you have an %s interface?", $type), "No") or return;
+			      $o->ask_yesorno('', _("Do you have an %s interface?", $type), "No") or return;
 
 	push @l, [ $o->loadModule($type) ];
     }
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 4fc947206..f76e0733c 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: panoramix VERSION\n"
-"POT-Creation-Date: 1999-09-04 16:55+0200\n"
+"POT-Creation-Date: 1999-09-04 19:36+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -64,8 +64,8 @@ msgstr "En feil oppsto, prøv å endre noen parametere"
 msgid "Automatic resolutions"
 msgstr "Automatiske oppløsninger"
 
-#: ../Xconfigurator.pm_.c:333 ../install_steps_interactive.pm_.c:281
-#: ../install_steps_interactive.pm_.c:282
+#: ../Xconfigurator.pm_.c:333 ../install_steps_interactive.pm_.c:295
+#: ../install_steps_interactive.pm_.c:296
 msgid "Resolution"
 msgstr "Oppløsning"
 
@@ -515,8 +515,8 @@ msgstr "Les nøye!"
 msgid "all data on this partition will be lost"
 msgstr "alle data på denne partisjonen vil gå tapt"
 
-#: ../diskdrake.pm_.c:136 ../install2.pm_.c:377 ../install_steps.pm_.c:72
-#: ../install_steps_interactive.pm_.c:26
+#: ../diskdrake.pm_.c:136 ../install2.pm_.c:383 ../install_steps.pm_.c:76
+#: ../install_steps_interactive.pm_.c:32
 msgid "Error"
 msgstr "Feil"
 
@@ -756,15 +756,15 @@ msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved åpning av %s for skriving: %s"
 
-#: ../install2.pm_.c:37
+#: ../install2.pm_.c:35
 msgid "Choose preferred language for install and system usage."
 msgstr ""
 
-#: ../install2.pm_.c:40
+#: ../install2.pm_.c:38
 msgid "Choose on the list of keyboards, the one corresponding to yours"
 msgstr ""
 
-#: ../install2.pm_.c:43
+#: ../install2.pm_.c:41
 #, fuzzy
 msgid ""
 "Choose \"Installation\" if there are no previous versions of Linux\n"
@@ -781,7 +781,7 @@ msgstr ""
 "(Venice), 5.2 (Leeloo), 5.3 (Festen) eller\n"
 " 6.0 (Venus)."
 
-#: ../install2.pm_.c:50
+#: ../install2.pm_.c:48
 msgid ""
 "Select:\n"
 "  - Beginner: If you have not installed Linux before, or wish to install\n"
@@ -808,7 +808,7 @@ msgstr ""
 "opprettholde\n"
 "kontrollen over installasjonen så er dette valget for deg."
 
-#: ../install2.pm_.c:63
+#: ../install2.pm_.c:61
 #, fuzzy
 msgid ""
 "The system did not detect a SCSI card. If you have one (or several)\n"
@@ -831,7 +831,7 @@ msgstr ""
 "under \"System\"\n"
 " i \"Kontrollpanelet\"."
 
-#: ../install2.pm_.c:73
+#: ../install2.pm_.c:71
 msgid ""
 "At this point, hard drive partitions must be defined. (Unless you\n"
 "are overwriting a previous install of Linux and have already defined\n"
@@ -846,7 +846,7 @@ msgid ""
 "be. Consult the documentation and take your time before proceeding."
 msgstr ""
 
-#: ../install2.pm_.c:86
+#: ../install2.pm_.c:84
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use. At this time, you may wish to re-format some pre-existing\n"
@@ -861,7 +861,7 @@ msgstr ""
 "hvis de inneholder data som\n"
 "du ønsker å beholde (typiske tilfeller: / home and / usr/local)."
 
-#: ../install2.pm_.c:93
+#: ../install2.pm_.c:91
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
@@ -888,7 +888,7 @@ msgstr ""
 "sone \"Infos\"\n"
 "funnet over knappene til bekreftelse/valg/fjern valg."
 
-#: ../install2.pm_.c:106
+#: ../install2.pm_.c:104
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should only take a few minutes."
@@ -896,13 +896,13 @@ msgstr ""
 "Pakkene som er valgt blir nå installert på systemet ditt. Dette tar bare "
 "noen få minutter."
 
-#: ../install2.pm_.c:110 ../install2.pm_.c:113 ../install2.pm_.c:116
-#: ../install2.pm_.c:119 ../install2.pm_.c:122 ../install2.pm_.c:154
-#: ../install2.pm_.c:169 ../install2.pm_.c:201
+#: ../install2.pm_.c:108 ../install2.pm_.c:111 ../install2.pm_.c:114
+#: ../install2.pm_.c:117 ../install2.pm_.c:120 ../install2.pm_.c:152
+#: ../install2.pm_.c:167 ../install2.pm_.c:199
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../install2.pm_.c:125
+#: ../install2.pm_.c:123
 msgid ""
 "An administrator password for your Linux system must now be\n"
 "assigned. The password must be entered twice to verify that both\n"
@@ -921,7 +921,7 @@ msgid ""
 "\"password\", type the password that was created here."
 msgstr ""
 
-#: ../install2.pm_.c:142
+#: ../install2.pm_.c:140
 msgid ""
 "You can now authorize one or more people to use your Linux\n"
 "system. Each user account will have their own customizable environment.\n"
@@ -935,7 +935,7 @@ msgid ""
 "accomplished from a regular user account."
 msgstr ""
 
-#: ../install2.pm_.c:157
+#: ../install2.pm_.c:155
 #, fuzzy
 msgid ""
 "You need to indicate where you wish\n"
@@ -949,7 +949,7 @@ msgstr ""
 "Med mindre du vet akkurat hva du gjør, velg alltid \"Første sektor av "
 "disken\"."
 
-#: ../install2.pm_.c:164
+#: ../install2.pm_.c:162
 msgid ""
 "It is now time to configure the video card and monitor\n"
 "configuration for the X windows Graphic User Interface (GUI). First\n"
@@ -957,103 +957,103 @@ msgid ""
 "your selections if necessary."
 msgstr ""
 
-#: ../install2.pm_.c:175
+#: ../install2.pm_.c:173
 msgid "Choose your language"
 msgstr "Velg språk"
 
-#: ../install2.pm_.c:176
+#: ../install2.pm_.c:174
 msgid "Choose install or upgrade"
 msgstr "Velg installering eller oppgradering"
 
-#: ../install2.pm_.c:177
+#: ../install2.pm_.c:175
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
-#: ../install2.pm_.c:178
+#: ../install2.pm_.c:176
 #, fuzzy
 msgid "Choose your keyboard"
 msgstr "Velg språk"
 
-#: ../install2.pm_.c:179
+#: ../install2.pm_.c:177
 msgid "Setup SCSI"
 msgstr "Oppsett SCSI"
 
-#: ../install2.pm_.c:180
+#: ../install2.pm_.c:178
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
 
-#: ../install2.pm_.c:181
+#: ../install2.pm_.c:179
 msgid "Format partitions"
 msgstr "Formater partisjoner"
 
-#: ../install2.pm_.c:182
+#: ../install2.pm_.c:180
 msgid "Choose packages to install"
 msgstr "Velg pakker for installering"
 
-#: ../install2.pm_.c:183
+#: ../install2.pm_.c:181
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../install2.pm_.c:184
+#: ../install2.pm_.c:182
 #, fuzzy
 msgid "Configure mouse"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:185
+#: ../install2.pm_.c:183
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../install2.pm_.c:186
+#: ../install2.pm_.c:184
 #, fuzzy
 msgid "Configure timezone"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:188
+#: ../install2.pm_.c:186
 #, fuzzy
 msgid "Configure printer"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:189 ../install_steps_graphical.pm_.c:444
+#: ../install2.pm_.c:187 ../install_steps_graphical.pm_.c:444
 msgid "Set root password"
 msgstr "Sett root passord"
 
-#: ../install2.pm_.c:190
+#: ../install2.pm_.c:188
 msgid "Add a user"
 msgstr "Legg til en bruker"
 
-#: ../install2.pm_.c:191
+#: ../install2.pm_.c:189
 msgid "Create bootdisk"
 msgstr "Opprett oppstartdiskett"
 
-#: ../install2.pm_.c:192
+#: ../install2.pm_.c:190
 msgid "Install bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../install2.pm_.c:193
+#: ../install2.pm_.c:191
 msgid "Configure X"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:194
+#: ../install2.pm_.c:192
 msgid "Exit install"
 msgstr "Gå ut av installering"
 
-#: ../install2.pm_.c:226
+#: ../install2.pm_.c:224
 msgid "beginner"
 msgstr "nybegynner"
 
-#: ../install2.pm_.c:226
+#: ../install2.pm_.c:224
 msgid "developer"
 msgstr "utvikler"
 
-#: ../install2.pm_.c:226
+#: ../install2.pm_.c:224
 msgid "expert"
 msgstr "ekspert"
 
-#: ../install2.pm_.c:226
+#: ../install2.pm_.c:224
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:387
+#: ../install2.pm_.c:393
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -1061,11 +1061,11 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: ../install2.pm_.c:402
+#: ../install2.pm_.c:408
 msgid "partitioning failed: no root filesystem"
 msgstr "partisjonering feilet: intet root filsystem"
 
-#: ../install_steps.pm_.c:257
+#: ../install_steps.pm_.c:273
 msgid "no floppy available"
 msgstr ""
 
@@ -1212,157 +1212,157 @@ msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde bokstaver, tall, `-' og `_'"
 
-#: ../install_steps_interactive.pm_.c:26
+#: ../install_steps_interactive.pm_.c:32
 msgid "An error occurred"
 msgstr "En feil oppsto"
 
-#: ../install_steps_interactive.pm_.c:33
+#: ../install_steps_interactive.pm_.c:44
 msgid "Which language do you want?"
 msgstr "Hvilket språk ønsker du?"
 
-#: ../install_steps_interactive.pm_.c:41
+#: ../install_steps_interactive.pm_.c:55
 #, fuzzy
 msgid "Which keyboard do you have?"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../install_steps_interactive.pm_.c:48
+#: ../install_steps_interactive.pm_.c:64
 msgid "Install/Upgrade"
 msgstr "Installer/Oppgrader"
 
-#: ../install_steps_interactive.pm_.c:49
+#: ../install_steps_interactive.pm_.c:65
 #, fuzzy
 msgid "Is this an install or an upgrade?"
 msgstr "Er det en installasjon eller en oppgradering?"
 
-#: ../install_steps_interactive.pm_.c:50
+#: ../install_steps_interactive.pm_.c:66
 msgid "Install"
 msgstr "Installer"
 
-#: ../install_steps_interactive.pm_.c:50
+#: ../install_steps_interactive.pm_.c:66
 msgid "Upgrade"
 msgstr "Oppgrader"
 
-#: ../install_steps_interactive.pm_.c:56
+#: ../install_steps_interactive.pm_.c:74
 msgid "Install Class"
 msgstr "Installeringsklasse"
 
-#: ../install_steps_interactive.pm_.c:57
+#: ../install_steps_interactive.pm_.c:75
 msgid "What type of user will you have?"
 msgstr "Hva slags brukertype vil du ha?"
 
-#: ../install_steps_interactive.pm_.c:65
+#: ../install_steps_interactive.pm_.c:85
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Du må starte maskinen på nytt for at modifiseringene av partisjonstabellen "
 "skal tre i kraft"
 
-#: ../install_steps_interactive.pm_.c:75
+#: ../install_steps_interactive.pm_.c:97
 msgid "Choose the partitions you want to format"
 msgstr "Velg de partisjonene du ønsker å formatere"
 
-#: ../install_steps_interactive.pm_.c:86
+#: ../install_steps_interactive.pm_.c:108
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formaterer partisjon %s"
 
-#: ../install_steps_interactive.pm_.c:99
+#: ../install_steps_interactive.pm_.c:121
 msgid "Keep the current IP configuration"
 msgstr "Behold nåværende IP-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:100
+#: ../install_steps_interactive.pm_.c:122
 msgid "Reconfigure network now"
 msgstr "Rekonfigurer nettverket nå"
 
-#: ../install_steps_interactive.pm_.c:101
+#: ../install_steps_interactive.pm_.c:123
 msgid "Don't set up networking"
 msgstr "Ikke sett opp nettverk"
 
-#: ../install_steps_interactive.pm_.c:103
-#: ../install_steps_interactive.pm_.c:109
+#: ../install_steps_interactive.pm_.c:125
+#: ../install_steps_interactive.pm_.c:131
 msgid "Network Configuration"
 msgstr "Nettverks-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:104
+#: ../install_steps_interactive.pm_.c:126
 msgid "LAN networking has already been configured. Do you want to:"
 msgstr "LAN nettverket har allerede blitt konfigurert. Vil du:"
 
-#: ../install_steps_interactive.pm_.c:110
+#: ../install_steps_interactive.pm_.c:132
 msgid ""
 "Do you want to configure LAN (not dialup) networking for your installed "
 "system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:163
+#: ../install_steps_interactive.pm_.c:177
 msgid "Standard Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:164
+#: ../install_steps_interactive.pm_.c:178
 msgid ""
 "Every print queue (which print jobs are directed to) needs a \n"
 "\t\t\t   name (often lp) and a spool directory associated with it. What \n"
 "\t\t\t   name and directory should be used for this queue?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:167
+#: ../install_steps_interactive.pm_.c:181
 msgid "Name of queue:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:167
+#: ../install_steps_interactive.pm_.c:181
 msgid "Spool directory:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:178
+#: ../install_steps_interactive.pm_.c:192
 msgid "Select Printer Connection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:179
+#: ../install_steps_interactive.pm_.c:193
 msgid "How is the printer connected?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:194
+#: ../install_steps_interactive.pm_.c:208
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:196
+#: ../install_steps_interactive.pm_.c:210
 msgid "I detect :"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:202
+#: ../install_steps_interactive.pm_.c:214
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:204
+#: ../install_steps_interactive.pm_.c:216
 #, fuzzy
 msgid "Printer Device:"
 msgstr "Enhet: "
 
-#: ../install_steps_interactive.pm_.c:210
+#: ../install_steps_interactive.pm_.c:222
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:211
+#: ../install_steps_interactive.pm_.c:223
 msgid ""
 "To use a remote lpd print queue, you need to supply \n"
 "the hostname of the printer server and the queue name \n"
 "on that server which jobs should be placed in."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:214
+#: ../install_steps_interactive.pm_.c:226
 #, fuzzy
 msgid "Remote hostname:"
 msgstr "Brukernavn"
 
-#: ../install_steps_interactive.pm_.c:214
+#: ../install_steps_interactive.pm_.c:226
 msgid "Remote queue:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:219
+#: ../install_steps_interactive.pm_.c:231
 msgid "SMB/Windows 95/NT Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:220
+#: ../install_steps_interactive.pm_.c:232
 msgid ""
 "To print to a SMB printer, you need to provide the \n"
 "SMB host name (this is not always the same as the machines \n"
@@ -1371,42 +1371,42 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:225
+#: ../install_steps_interactive.pm_.c:237
 #, fuzzy
 msgid "SMB server IP:"
 msgstr "tjener"
 
-#: ../install_steps_interactive.pm_.c:225
+#: ../install_steps_interactive.pm_.c:237
 #, fuzzy
 msgid "SMB server host:"
 msgstr "tjener"
 
-#: ../install_steps_interactive.pm_.c:226
-#: ../install_steps_interactive.pm_.c:240
+#: ../install_steps_interactive.pm_.c:238
+#: ../install_steps_interactive.pm_.c:252
 #, fuzzy
 msgid "Password:"
 msgstr "Passord"
 
-#: ../install_steps_interactive.pm_.c:226
+#: ../install_steps_interactive.pm_.c:238
 #, fuzzy
 msgid "Share name:"
 msgstr "Brukernavn"
 
-#: ../install_steps_interactive.pm_.c:226
-#: ../install_steps_interactive.pm_.c:240
+#: ../install_steps_interactive.pm_.c:238
+#: ../install_steps_interactive.pm_.c:252
 #, fuzzy
 msgid "User name:"
 msgstr "Brukernavn"
 
-#: ../install_steps_interactive.pm_.c:227
+#: ../install_steps_interactive.pm_.c:239
 msgid "Workgroup:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:234
+#: ../install_steps_interactive.pm_.c:246
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:235
+#: ../install_steps_interactive.pm_.c:247
 msgid ""
 "To print to a NetWare printer, you need to provide the \n"
 "NetWare print server name (this is not always the same as the machines \n"
@@ -1414,56 +1414,56 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:239
+#: ../install_steps_interactive.pm_.c:251
 msgid "Print Queue Name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:239
+#: ../install_steps_interactive.pm_.c:251
 msgid "Printer Server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:259
+#: ../install_steps_interactive.pm_.c:273
 #, fuzzy
 msgid "Configure Printer"
 msgstr "Konfigurer X"
 
-#: ../install_steps_interactive.pm_.c:260
+#: ../install_steps_interactive.pm_.c:274
 #, fuzzy
 msgid "What type of printer do you have?"
 msgstr "Hva slags brukertype vil du ha?"
 
-#: ../install_steps_interactive.pm_.c:271
-#: ../install_steps_interactive.pm_.c:272
+#: ../install_steps_interactive.pm_.c:285
+#: ../install_steps_interactive.pm_.c:286
 msgid "Paper Size"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:295
+#: ../install_steps_interactive.pm_.c:305
 msgid "CRLF"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:296
+#: ../install_steps_interactive.pm_.c:306
 msgid "Fix stair-stepping of text?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:310
+#: ../install_steps_interactive.pm_.c:321
 #, fuzzy
 msgid "Configure Uniprint Driver"
 msgstr "Konfigurer X"
 
-#: ../install_steps_interactive.pm_.c:311
+#: ../install_steps_interactive.pm_.c:322
 msgid "You may now configure the uniprint options for this printer."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:319
+#: ../install_steps_interactive.pm_.c:330
 #, fuzzy
 msgid "Configure Color Depth"
 msgstr "Konfigurer X"
 
-#: ../install_steps_interactive.pm_.c:320
+#: ../install_steps_interactive.pm_.c:331
 msgid "You may now configure the color options for this printer."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:339
+#: ../install_steps_interactive.pm_.c:351
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -1477,75 +1477,111 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:348
+#: ../install_steps_interactive.pm_.c:359
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:362
+#, fuzzy
+msgid "Choose the floppy drive you want to use to make the bootdisk"
+msgstr "Velg de partisjonene du ønsker å formatere"
+
+#: ../install_steps_interactive.pm_.c:366
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:356
+#: ../install_steps_interactive.pm_.c:367
 #, fuzzy
 msgid "Creating bootdisk"
 msgstr "Opprett oppstartdiskett"
 
-#: ../install_steps_interactive.pm_.c:362
+#: ../install_steps_interactive.pm_.c:373
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:362
+#: ../install_steps_interactive.pm_.c:373
 msgid "First sector of drive"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:365
+#: ../install_steps_interactive.pm_.c:376
 #, fuzzy
 msgid "Lilo Installation"
 msgstr "Installerer"
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:377
 #, fuzzy
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor vil du montere %s enheten?"
 
-#: ../install_steps_interactive.pm_.c:389
+#: ../install_steps_interactive.pm_.c:387
+msgid ""
+"Congratulations, installation is complete.\n"
+"Remove the boot media and press return to reboot.\n"
+"For information on fixes which are available for this release of Linux "
+"Mandrake,\n"
+"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"Information on configuring your system is available in the post\n"
+"install chapter of the Official Linux Mandrake User's Guide."
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:400
 #, fuzzy, c-format
 msgid "What %s card have you?"
 msgstr "Hva slags scsi-kort har du?"
 
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:404
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:409
 msgid "Autoprobe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:409
 msgid "Specify options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:404
+#: ../install_steps_interactive.pm_.c:412
+#, c-format
+msgid ""
+"Here must give the different options for the module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For example you can have ``io=0x300 irq=7''"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:415
 msgid "Module options:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:416
+#: ../install_steps_interactive.pm_.c:427
 #, fuzzy, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for scsi-kort %s"
 
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:428
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
-#: ../install_steps_interactive.pm_.c:430
+#: ../install_steps_interactive.pm_.c:441
 #, fuzzy, c-format
 msgid "Found %s %s interfaces"
 msgstr " scsi grensesnitt"
 
-#: ../install_steps_interactive.pm_.c:431
+#: ../install_steps_interactive.pm_.c:442
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../install_steps_interactive.pm_.c:432
+#: ../install_steps_interactive.pm_.c:443
 #, fuzzy, c-format
 msgid "Do you have an %s interface?"
 msgstr "Har du et scsi grensesnitt"