*** empty log message ***

15 files changed, 482 insertions, 247 deletions

diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index f09a3e0e6..57f310d6a 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -79,7 +79,7 @@ sub getinfoFromXF86Config {
 sub getinfoFromSysconfig {
     my $o = shift || {};
 
-    add2hash($o->{mouse}, { mouse::read("/etc/sysconfig/mouse") });
+    add2hash($o->{mouse}, getVarsFromSh("/etc/sysconfig/mouse"));
 
     if (my %keyboard = getVarsFromSh "/etc/sysconfig/keyboard") {
 	$keyboard{KEYTABLE} or last;
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 35bed9e67..8d6bf4307 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int
 
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
-    common     => [ qw(__ even odd min max sqr sum sign product bool listlength bool2text to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ],
+    common     => [ qw(__ even odd min max sqr sum sign product bool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX) ],
     functional => [ qw(fold_left compose map_index grep_index map_each grep_each map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ],
     file       => [ qw(dirname basename touch all glob_ cat_ chop_ mode) ],
     system     => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ crypt_ getVarsFromSh setVarsInSh) ],
@@ -60,6 +60,7 @@ sub basename { @_ == 1 or die "usage: basename <name>\n"; local $_ = shift; s|/*
 sub bool { $_[0] ? 1 : 0 }
 sub listlength { scalar @_ }
 sub bool2text { $_[0] ? "true" : "false" }
+sub text2bool { my $t = lc($_[0]); $t eq "true" || $t eq "yes" ? 1 : 0 }
 sub strcpy { substr($_[0], $_[2] || 0, length $_[1]) = $_[1] }
 sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l }
 sub chop_ { map { my $l = $_; chomp $l; $l } @_ }
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 3e0d82c8b..23ef5e380 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -39,7 +39,7 @@ sub check_mounted($) {
     open H, "/proc/swaps";
     foreach (<F>, <G>, <H>) {
 	foreach my $p (@$fstab) {
-	    /$p->{device}\s/ and $p->{isMounted} = $p->{isFormatted} = 1;
+	    /$p->{device}\s+([^\s]*)\s+/ and $p->{currentMntpoint} = $1, $p->{isMounted} = $p->{isFormatted} = 1;
 	}
     }
 }
@@ -130,6 +130,7 @@ sub mount($$$;$) {
 #- takes the mount point to umount (can also be the device)
 sub umount($) {
     my ($mntpoint) = @_;
+    log::l("calling umount($mntpoint)");
     syscall_('umount', $mntpoint) or die _("error unmounting %s: %s", $mntpoint, "$!");
 
     my @mtab = cat_('/etc/mtab'); #- don't care about error, if we can't read, we won't manage to write... (and mess mtab)
@@ -147,7 +148,8 @@ sub mount_part($;$) {
 	swap::swapon($part->{device});
     } else {
 	$part->{mntpoint} or die "missing mount point";
-	mount(devices::make($part->{device}), ($prefix || '') . $part->{mntpoint}, type2fs($part->{type}), 0);
+	mount(devices::make($part->{device}), ($prefix || '') . $part->{mntpoint}, type2fs($part->{type}),
+	      $part->{mntreadonly} ? 1 : 0);
     }
     $part->{isMounted} = $part->{isFormatted} = 1; #- assume that if mount works, partition is formatted
 }
@@ -252,3 +254,20 @@ sub write_fstab($;$$) {
     }
     print F join(" ", @$_), "\n" foreach @to_add;
 }
+
+sub check_mount_all_fstab($;$) {
+    my ($fstab, $prefix) = @_;
+    $prefix ||= '';
+
+    foreach (sort { ($a->{mntpoint} || '') cmp ($b->{mntpoint} || '') } @$fstab) {
+	#- avoid unwanted mount in fstab.
+	next if ($_->{device} =~ /none/ || $_->{type} =~ /nfs|smbfs|ncpfs|proc/ || $_->{options} =~ /noauto|ro/);
+
+	#- TODO fsck
+
+	eval { mount(devices::make($_->{device}), $prefix . $_->{mntpoint}, $_->{type}, 0); };
+	if ($@) {
+	    log::l("unable to mount partition $_->{device} on $prefix/$_->{mntpoint}");
+	}
+    }
+}
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cd53e4b6c..fd6aae4a6 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -36,11 +36,11 @@ use run_program;
 my @installStepsFields = qw(text redoable onError needs entered reachable toBeDone help next done);
 my @installSteps = (
   selectLanguage     => [ __("Choose your language"), 1, 1 ],
-  selectPath         => [ __("Choose install or upgrade"), 0, 0 ],
-  selectInstallClass => [ __("Select installation class"), 1, 1, "selectPath" ],
+  selectInstallClass => [ __("Select installation class"), 1, 1 ],
+  setupSCSI          => [ __("Setup SCSI"), 1, 0 ],
+  selectPath         => [ __("Choose install or upgrade"), 0, 0, "selectInstallClass" ],
   selectMouse        => [ __("Configure mouse"), 1, 1 ],
   selectKeyboard     => [ __("Choose your keyboard"), 1, 1 ],
-  setupSCSI          => [ __("Setup SCSI"), 1, 0 ],
   partitionDisks     => [ __("Setup filesystems"), 1, 0 ],
   formatPartitions   => [ __("Format partitions"), 1, -1, "partitionDisks" ],
   choosePackages     => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ],
@@ -138,12 +138,12 @@ $o = $::o = {
 
     timezone => {
 #-                   timezone => "Europe/Paris",
-                   GMT      => 1,
+#-                   GMT      => 1,
                 },
     printer => {
-                 want     => 1,
+                 want     => 0,
                  complete => 0,
-                 str_type => $printer::printer_type[0],
+                 str_type => $printer::printer_type_default,
                  QUEUE    => "lp",
                  SPOOLDIR => "/var/spool/lpd/lp",
                  DBENTRY  => "DeskJet670",
@@ -209,16 +209,24 @@ sub selectLanguage {
 
 #------------------------------------------------------------------------------
 sub selectMouse {
-    $o->selectMouse($_[0]);
-    addToBeDone { mouse::write($o->{mouse}, $o->{prefix}); } 'formatPartitions';
+    my ($clicked) = $_[0];
+
+    $o->{mouse} or $o->{mouse} = {};
+    add2hash($o->{mouse}, { mouse::read($o->{prefix}) }) if $o->{isUpgrade} && !$clicked;
+
+    $o->selectMouse($clicked);
+    addToBeDone { mouse::write($o->{prefix}, $o->{mouse}); } 'formatPartitions';
 }
 
 #------------------------------------------------------------------------------
 sub selectKeyboard {
     my ($clicked) = $_[0];
-    return if $::beginner && !$clicked;
 
-    $o->selectKeyboard;
+    return unless $o->{isUpgrade} || !$::beginner || $clicked;
+
+    $o->{keyboard} = (keyboard::read($o->{prefix}))[0] if $o->{isUpgrade} && !$clicked && !$o->{keyboard};
+    $o->selectKeyboard if !$::beginner || $clicked;
+
     #- if we go back to the selectKeyboard, you must rewrite
     addToBeDone {
 	keyboard::write($o->{prefix}, $o->{keyboard});
@@ -226,7 +234,88 @@ sub selectKeyboard {
 }
 
 #------------------------------------------------------------------------------
-sub selectPath { $o->selectPath; }
+sub selectPath {
+    $o->selectPath;
+
+    if ($o->{isUpgrade}) {
+	#- try to find the partition where the system is installed if beginner
+	#- else ask the user the right partition, and test it after.
+	unless ($o->{hds}) {
+	    $o->{drives} = [ detect_devices::hds() ];
+	    $o->{hds} = catch_cdie { fsedit::hds($o->{drives}, $o->{partitioning}) }
+	      sub { 1; };
+
+	    unless (@{$o->{hds}} > 0) {
+		$o->setupSCSI if $o->{autoSCSI}; #- ask for an unautodetected scsi card
+	    }
+	}
+
+	my @normal_partitions = fsedit::get_fstab(@{$o->{hds}});
+
+	fs::check_mounted([@normal_partitions]);
+
+	#- get all ext2 partition that may be root partition.
+	my %partitions_lookup;
+	my @partitions = map {
+	    $partitions_lookup{$_->{device}} = $_;
+	    type2fs($_->{type}) eq 'ext2' ? $_->{device} : (); } @normal_partitions;
+
+	my $root;
+	my $root_partition;
+	my $selected_partition;
+	do {
+	    if ($selected_partition->{mntpoint} && !$selected_partition->{currentMntpoint}) {
+		$o->ask_warn(_("Information"), "$selected_partition->{device}" . _(" : This is not a root partition, try again."))
+		  unless $::beginner;
+		log::l("umounting non root partition $selected_partition->{device}");
+		eval { fs::umount_part($selected_partition); };
+		$selected_partition->{mntpoint} = '';
+		$selected_partition->{mntreadonly} = undef;
+	    }
+
+	    $root_partition = $::beginner ? $partitions[0] : $o->selectRootPartition(@partitions);
+	    $selected_partition = $partitions_lookup{$root_partition};
+
+	    unless ($root = $selected_partition->{currentMntpoint}) {
+		$selected_partition->{mntpoint} = $root = $o->{prefix};
+		$selected_partition->{mntreadonly} = 1;
+		log::l("trying to mount root partition $root_partition");
+		eval { fs::mount_part($selected_partition); };
+	    }
+
+	    #- avoid testing twice a partition.
+	    for my $i (0..$#partitions) {
+		splice @partitions, $i, 1 if $partitions[$i] eq $root_partition;
+	    }
+	} until $root && -d "$root/etc/sysconfig" && -r "$root/etc/fstab" || !(scalar @partitions);
+
+	
+	if ($root && -d "$root/etc/sysconfig" && -r "$root/etc/fstab") {
+	    $o->ask_warn(_("Information"), _("Found root partition : ") . $root_partition);
+	    $o->{prefix} = $root;
+	    $o->{fstab} = \@normal_partitions;
+
+	    #- test if the partition has to be fschecked and remounted rw.
+	    if ($selected_partition->{mntpoint} && !$selected_partition->{currentMntpoint}) {
+		my @fstab = fs::read_fstab("$root/etc/fstab");
+
+		eval { fs::umount_part($selected_partition); };
+		$selected_partition->{mntpoint} = '';
+		$selected_partition->{mntreadonly} = undef;
+
+		foreach (@fstab) {
+		    if ($selected_partition = $partitions_lookup{$_->{device}}) {
+			$selected_partition->{mntpoint} = $_->{mntpoint};
+		    }
+		}
+		#- TODO fsck, create check_mount_all ?
+		fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
+	    }
+	} else {
+	    $o->ask_warn(_("Error"), _("No root partition found"));
+	}
+    }
+}
 
 #------------------------------------------------------------------------------
 sub selectInstallClass {
@@ -250,6 +339,8 @@ sub setupSCSI {
 
 #------------------------------------------------------------------------------
 sub partitionDisks {
+    return if ($o->{isUpgrade});
+
     unless ($o->{hds}) {
 	$o->{drives} = [ detect_devices::hds() ];
 	$o->{hds} = catch_cdie { fsedit::hds($o->{drives}, $o->{partitioning}) }
@@ -291,6 +382,8 @@ I'll try to go on blanking bad partitions"));
 }
 
 sub formatPartitions {
+    return if ($o->{isUpgrade});
+
     $o->choosePartitionsToFormat($o->{fstab});
 
     unless ($::testing) {
@@ -321,6 +414,18 @@ sub doInstallStep {
 #------------------------------------------------------------------------------
 sub configureNetwork {
     my ($clicked, $entered) = @_;
+
+    if ($o->{isUpgrade} && !$clicked) {
+	$o->{netc} or $o->{netc} = {};
+	add2hash($o->{netc}, { network::read_conf("$o->{prefix}/etc/sysconfig/network") });
+	add2hash($o->{netc}, { network::read_resolv_conf("$o->{prefix}/etc/resolv.conf") });
+	foreach (all("$o->{prefix}/etc/sysconfig/network-scripts")) {
+	    if (/ifcfg-(\w*)/) {
+		push @{$o->{intf}}, { network::read_conf("$o->{prefix}/etc/sysconfig/network-scripts/$_") };
+	    }
+	}
+    }
+
     $o->configureNetwork($entered == 1 && !$clicked)
 }
 #------------------------------------------------------------------------------
@@ -330,6 +435,9 @@ sub configureTimezone {
     my $f = "$o->{prefix}/etc/sysconfig/clock";
     return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked && !$::testing;
 
+    add2hash($o->{timezone}, { timezone::read($f) }) if $o->{isUpgrade} && !$clicked;
+    $o->{timezone}{GMT} = 1 unless exists $o->{timezone}{GMT}; #- take GMT by default if nothing else.
+
     $o->timeConfig($f);
 }
 #------------------------------------------------------------------------------
@@ -337,9 +445,15 @@ sub configureServices { $o->servicesConfig  }
 #------------------------------------------------------------------------------
 sub configurePrinter  { $o->printerConfig   }
 #------------------------------------------------------------------------------
-sub setRootPassword   { $o->setRootPassword }
+sub setRootPassword {
+    return if ($o->{isUpgrade});
+
+    $o->setRootPassword;
+}
 #------------------------------------------------------------------------------
 sub addUser {
+    return if ($o->{isUpgrade});
+
     $o->addUser;
 
     addToBeDone {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index bf68f7971..d86ba2ee5 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -90,7 +90,7 @@ sub selectLanguage {
 sub selectKeyboard {
     my ($o) = @_;
     keyboard::setup($o->{keyboard})
-  }
+}
 #------------------------------------------------------------------------------
 sub selectPath {}
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6ccbb8451..213347628 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -75,7 +75,16 @@ sub selectPath($) {
 			 [ __("Install"), __("Upgrade") ],
 			 $o->{isUpgrade} ? "Upgrade" : "Install") eq "Upgrade";
     install_steps::selectPath($o);
-
+}
+#------------------------------------------------------------------------------
+sub selectRootPartition($@) {
+    my ($o,@partitions) = @_;
+    $o->{upgradeRootPartition} =
+      $o->ask_from_list_(_("Root Partition"),
+			 _("What is the root partition of your system?"),
+			 [ @partitions ], $o->{upgradeRootPartitions});
+#- TODO check choice, then mount partition in $o->{prefix} and autodetect.
+#-    install_steps::selectRootPartition($o);
 }
 #------------------------------------------------------------------------------
 sub selectInstallClass($@) {
@@ -167,7 +176,7 @@ sub configureNetwork($) {
 			_("Do you want to configure LAN (not dialup) networking for your installed system?")) or $r = "Don't";
     }
 
-    if ($r =~ /^Don't/) {
+    if ($r =~ /^Don\'t/) {
 	$o->{netc}{NETWORKING} = "false";
     } elsif ($r !~ /^Keep/) {
 	$o->setup_thiskind('net', !$::expert, 1);
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index a6a8a1341..ed2c79de4 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -49,12 +49,12 @@ sub ask_warn($$$) {
 
 sub ask_yesorno($$$;$) {
     my ($o, $title, $message, $def) = @_;
-    ask_from_list2_($o, $title, $message, [ __("Yes"), __("No") ], $def ? "No" : "Yes") eq "Yes";
+    ask_from_list2_($o, $title, $message, [ __("Yes"), __("No") ], $def ? "Yes" : "No") eq "Yes";
 }
 
 sub ask_okcancel($$$;$) {
     my ($o, $title, $message, $def) = @_;
-    ask_from_list2_($o, $title, $message, [ __("Ok"), __("Cancel") ], $def ? "Cancel" : "Ok") eq "Ok";
+    ask_from_list2_($o, $title, $message, [ __("Ok"), __("Cancel") ], $def ? "Ok" : "Cancel") eq "Ok";
 }
 
 sub ask_from_list_ {
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 77322e803..9309d1a98 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -140,18 +140,10 @@ sub write($$) {
 }
 
 sub read($) {
-    my ($file) = @_;
+    my ($prefix) = @_;
 
-    local *F;
-    open F, "$file" or die "failed to read keyboard configuration";
-
-    foreach (<F>) {
-	($_) = /^KEYTABLE=(.*)/ or log::l("unrecognized entry in keyboard configuration file ($_)"), next;
-	s/^\s*"(.*)"\s*$/$1/;
-	s/\.[^.]*//; #- remove extension
-	return basename($_);
-    }
-    die "empty keyboard configuration file";
+    my %keyf = getVarsFromSh("$prefix/etc/sysconfig/keyboard");
+    map { kmap($_) eq $keyf{KEYTABLE} ? $_ : (); } keys %keyboards;
 }
 
 #-######################################################################################
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 010e7b48f..a829247fc 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -271,8 +271,13 @@ sub get_stage1_conf {
 sub load_thiskind($;&) {
     my ($type, $f) = @_;
 
-    my @devs = pci_probing::main::probe($type);
-    log::l("pci probe found " . scalar @devs . " $type devices");
+    my @pcidevs = pci_probing::main::probe($type);
+    log::l("pci probe found " . scalar @pcidevs . " $type devices");
+
+    my @pcmciadevs = get_pcmcia_devices($type);
+    log::l("pcmcia probe found " . scalar @pcmciadevs . " $type devices");
+
+    my @devs = (@pcidevs, @pcmciadevs);
 
     my %devs; foreach (@devs) {
 	my ($text, $mod) = @$_;
@@ -285,6 +290,26 @@ sub load_thiskind($;&) {
     @devs;
 }
 
+sub get_pcmcia_devices($) {
+    my ($type) = @_;
+    my $file = "/var/run/stab";
+    my @devs;
+    my $module;
+    my $desc;
+
+    local *F;
+    open F, $file or return; #- no pcmcia is not an error.
+    while (<F>) {
+	$desc = $1 if /^Socket\s+\d+:\s+(.*)/;
+	$module = $1 if /^\d+\s+$type[^\s]*\s+([^\s]+)/;
+	if ($desc && $module) {
+	    push @devs, [ $desc, $module ];
+	    $desc = $module = undef;
+	}
+    }
+    @devs;
+}
+
 #-#- This assumes only one of each driver type is loaded
 #-sub removeDeviceDriver {
 #-    my ($type) = @_;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 4e91da97c..27979ea8d 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -65,10 +65,15 @@ sub serial_ports_names2dev {
     /(\w+)/;
 }
 
-sub read($) { getVarsFromSh $_[0]; }
+sub read($) {
+    my ($prefix) = @_;
+    my %mouse = getVarsFromSh "$prefix/etc/sysconfig/mouse";
+    $mouse{device} = readlink "$prefix/dev/mouse" or log::l("reading $prefix/dev/mouse symlink failed");
+    %mouse;
+}
 
 sub write($;$) {
-    my ($mouse, $prefix) = @_;
+    my ($prefix, $mouse) = @_;
     local $mouse->{FULLNAME} = qq("$mouse->{FULLNAME}");
     setVarsInSh("$prefix/etc/sysconfig/mouse", $mouse, qw(MOUSETYPE XMOUSETYPE FULLNAME XEMU3));
     symlink $mouse->{device}, "$prefix/dev/mouse" or log::l("creating $prefix/dev/mouse symlink failed");
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 9c7c325c8..31fcd7e0f 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -22,6 +22,21 @@ sub read_conf {
     \%netc;
 }
 
+sub read_resolv_conf {
+    my ($file) = @_;
+    my %netc;
+    my @l;
+
+    local *F;
+    open F, $file or die "cannot open $file: $!";
+    foreach (<F>) {
+	push @l, $1 if (/^\s*nameserver\s+([^\s]+)/);
+    }
+
+    $netc{$_} = shift @l foreach qw(dnsServer dnsServer2 dnsServer3);
+    \%netc;
+}
+
 sub read_interface_conf {
     my ($file) = @_;
     my %intf = getVarsFromSh($file) or die "cannot open file $file: $!";
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index f7f31ced0..2f66e01ab 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -28,7 +28,7 @@ use strict;
 =cut
 
 #-#####################################################################################
-use vars qw(%thedb %printer_type %printer_type_inv @papersize_type %fields $spooldir @entries_db_short @entry_db_description %descr_to_db %db_to_descr);
+use vars qw(%thedb %printer_type %printer_type_inv $printer_type_default @papersize_type %fields $spooldir @entries_db_short @entry_db_description %descr_to_db %db_to_descr);
 #-#####################################################################################
 
 =head2 Imports
@@ -246,6 +246,7 @@ my $PRINTER_FILTER_DIR = "/usr/lib/rhs/rhs-printfilters";
     "NetWare"           => "NCP",
 );
 %printer_type_inv = reverse %printer_type;
+$printer_type_default = "local";
 
 %fields = (
     STANDARD => [qw(QUEUE SPOOLDIR IF)],
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 879f17a6c..2d0aa6db6 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -9,7 +9,7 @@ clean:
 
 $(POFILES): panoramix.pot
 	cp -f $@ $@t
-	msgmerge $@t $< > $@
+	msgmerge $@t $< > $@ || true
 	rm $@t
 
 panoramix.pot: $(PMSFILES)
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 71a821a00..15e46c0e3 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-26 12:55+0200\n"
+"POT-Creation-Date: 1999-09-28 17:12+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -57,114 +57,126 @@ msgstr "Vil du teste konfigurasjonen?"
 msgid "Test configuration"
 msgstr "Test konfigurasjon"
 
-#: ../Xconfigurator.pm_.c:295
+#: ../Xconfigurator.pm_.c:286
+#, fuzzy
+msgid "An error occurred:"
+msgstr "En feil oppsto"
+
+#: ../Xconfigurator.pm_.c:288
+#, fuzzy
+msgid ""
+"\n"
+"try changing some parameters"
+msgstr "En feil oppsto, pr�v � endre noen parametere"
+
+#: ../Xconfigurator.pm_.c:314
 #, c-format
 msgid "(leaving in %d seconds)"
 msgstr "(slutter om %d sekunder)"
 
-#: ../Xconfigurator.pm_.c:299
+#: ../Xconfigurator.pm_.c:318
 msgid "Is this ok?"
 msgstr "Er dette ok?"
 
-#: ../Xconfigurator.pm_.c:307
+#: ../Xconfigurator.pm_.c:326
 msgid "An error occurred, try changing some parameters"
 msgstr "En feil oppsto, pr�v � endre noen parametere"
 
-#: ../Xconfigurator.pm_.c:315 ../Xconfigurator.pm_.c:464
+#: ../Xconfigurator.pm_.c:334 ../Xconfigurator.pm_.c:483
 msgid "Automatic resolutions"
 msgstr "Automatiske oppl�sninger"
 
-#: ../Xconfigurator.pm_.c:363 ../install_steps_interactive.pm_.c:392
-#: ../install_steps_interactive.pm_.c:393
+#: ../Xconfigurator.pm_.c:382 ../install_steps_interactive.pm_.c:404
+#: ../install_steps_interactive.pm_.c:405
 msgid "Resolution"
 msgstr "Oppl�sning"
 
-#: ../Xconfigurator.pm_.c:397
+#: ../Xconfigurator.pm_.c:416
 msgid "Choose resolution and color depth"
 msgstr "Velg oppl�sning og fargedybde"
 
-#: ../Xconfigurator.pm_.c:656
+#: ../Xconfigurator.pm_.c:675
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-oppsett: %s\n"
 
-#: ../Xconfigurator.pm_.c:657
+#: ../Xconfigurator.pm_.c:676
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type mus: %s\n"
 
-#: ../Xconfigurator.pm_.c:658
+#: ../Xconfigurator.pm_.c:677
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Enhet mus: %s\n"
 
-#: ../Xconfigurator.pm_.c:659
+#: ../Xconfigurator.pm_.c:678
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../Xconfigurator.pm_.c:660
+#: ../Xconfigurator.pm_.c:679
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../Xconfigurator.pm_.c:661
+#: ../Xconfigurator.pm_.c:680
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../Xconfigurator.pm_.c:662
+#: ../Xconfigurator.pm_.c:681
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikk-kort: %s\n"
 
-#: ../Xconfigurator.pm_.c:663
+#: ../Xconfigurator.pm_.c:682
 #, c-format
 msgid "Graphic memory: %s KB\n"
 msgstr "Minne grafikk: %s KB\n"
 
-#: ../Xconfigurator.pm_.c:664
+#: ../Xconfigurator.pm_.c:683
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../Xconfigurator.pm_.c:689
+#: ../Xconfigurator.pm_.c:708
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../Xconfigurator.pm_.c:690
+#: ../Xconfigurator.pm_.c:709
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../Xconfigurator.pm_.c:691
+#: ../Xconfigurator.pm_.c:710
 msgid "Change Resolution"
 msgstr "Endre oppl�sning"
 
-#: ../Xconfigurator.pm_.c:692
+#: ../Xconfigurator.pm_.c:711
 msgid "Automatical resolutions search"
 msgstr "Automatisk oppl�sningss�k"
 
-#: ../Xconfigurator.pm_.c:696
+#: ../Xconfigurator.pm_.c:715
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../Xconfigurator.pm_.c:697
+#: ../Xconfigurator.pm_.c:716
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../Xconfigurator.pm_.c:698
+#: ../Xconfigurator.pm_.c:717
 msgid "Quit"
 msgstr "Slutt"
 
-#: ../Xconfigurator.pm_.c:701
+#: ../Xconfigurator.pm_.c:720
 msgid "What do you want to do?"
 msgstr "Hva vil du gj�re?"
 
-#: ../Xconfigurator.pm_.c:706
+#: ../Xconfigurator.pm_.c:725
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../Xconfigurator.pm_.c:712
+#: ../Xconfigurator.pm_.c:731
 msgid "X successfully configured"
 msgstr "Konfigurasjon av X vellykket"
 
@@ -436,7 +448,7 @@ msgstr "Formater"
 msgid "Move"
 msgstr "Flytt"
 
-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:429
 msgid "Resize"
 msgstr "Endre st�rrelse"
 
@@ -476,7 +488,7 @@ msgstr "Gjenopprett fra diskett"
 msgid "Save on floppy"
 msgstr "Lagre p� diskett"
 
-#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:582
+#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:594
 msgid "Done"
 msgstr "Ferdig"
 
@@ -533,12 +545,12 @@ 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:257 ../install_steps.pm_.c:66
-#: ../install_steps_interactive.pm_.c:36
+#: ../diskdrake.pm_.c:136 ../install2.pm_.c:315 ../install2.pm_.c:348
+#: ../install_steps.pm_.c:66 ../install_steps_interactive.pm_.c:36
 msgid "Error"
 msgstr "Feil"
 
-#: ../diskdrake.pm_.c:157 ../diskdrake.pm_.c:504
+#: ../diskdrake.pm_.c:157 ../diskdrake.pm_.c:506
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
@@ -686,51 +698,51 @@ msgstr "Du m� starte maskinen p� nytt for at modifiseringene skal tre i kraft"
 msgid "Computing fat filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
-#: ../diskdrake.pm_.c:413 ../diskdrake.pm_.c:455 ../interactive_gtk.pm_.c:207
+#: ../diskdrake.pm_.c:413 ../diskdrake.pm_.c:457 ../interactive_gtk.pm_.c:207
 msgid "Resizing"
 msgstr "Endrer st�rrelse"
 
-#: ../diskdrake.pm_.c:424
+#: ../diskdrake.pm_.c:426
 msgid "resizing"
 msgstr "endrer st�rrelse"
 
-#: ../diskdrake.pm_.c:434
+#: ../diskdrake.pm_.c:436
 msgid "Choose the new size"
 msgstr "Velg ny st�rrelse"
 
-#: ../diskdrake.pm_.c:434
+#: ../diskdrake.pm_.c:436 ../install_steps_graphical.pm_.c:269
 msgid "MB"
 msgstr "MB"
 
-#: ../diskdrake.pm_.c:481
+#: ../diskdrake.pm_.c:483
 msgid "Create a new partition"
 msgstr "Opprette en ny partisjon"
 
-#: ../diskdrake.pm_.c:497
+#: ../diskdrake.pm_.c:499
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: ../diskdrake.pm_.c:500
+#: ../diskdrake.pm_.c:502
 msgid "Size in MB: "
 msgstr "St�rrelse i MB: "
 
-#: ../diskdrake.pm_.c:503
+#: ../diskdrake.pm_.c:505
 msgid "Filesystem type: "
 msgstr "Filsystemtype: "
 
-#: ../diskdrake.pm_.c:505
+#: ../diskdrake.pm_.c:507
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../diskdrake.pm_.c:547 ../diskdrake.pm_.c:563
+#: ../diskdrake.pm_.c:549 ../diskdrake.pm_.c:565
 msgid "Select file"
 msgstr "Velg fil"
 
-#: ../diskdrake.pm_.c:564
+#: ../diskdrake.pm_.c:566
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../diskdrake.pm_.c:579
+#: ../diskdrake.pm_.c:581
 msgid "Searching for your lost partition table"
 msgstr "S�ker etter din tapte partisjonstabell"
 
@@ -752,7 +764,7 @@ msgstr "nfs montering mislykket"
 msgid "mount failed: "
 msgstr "montering mislykket: "
 
-#: ../fs.pm_.c:133
+#: ../fs.pm_.c:134
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "feil ved demontering av %s: %s"
@@ -771,7 +783,7 @@ msgstr "Monteringspunkter m� begynne med /"
 msgid "There is already a partition with mount point %s"
 msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
 
-#: ../fsedit.pm_.c:262
+#: ../fsedit.pm_.c:267
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved �pning av %s for skriving: %s"
@@ -1037,25 +1049,25 @@ msgid "Choose your language"
 msgstr "Velg spr�k"
 
 #: ../install2.pm_.c:39
-msgid "Choose install or upgrade"
-msgstr "Velg installering eller oppgradering"
-
-#: ../install2.pm_.c:40
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
+#: ../install2.pm_.c:40
+msgid "Setup SCSI"
+msgstr "Oppsett SCSI"
+
 #: ../install2.pm_.c:41
+msgid "Choose install or upgrade"
+msgstr "Velg installering eller oppgradering"
+
+#: ../install2.pm_.c:42
 msgid "Configure mouse"
 msgstr "Konfigurer mus"
 
-#: ../install2.pm_.c:42
+#: ../install2.pm_.c:43
 msgid "Choose your keyboard"
 msgstr "Velg tastatur"
 
-#: ../install2.pm_.c:43
-msgid "Setup SCSI"
-msgstr "Oppsett SCSI"
-
 #: ../install2.pm_.c:44
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
@@ -1084,8 +1096,8 @@ msgstr "Konfigurer tidssone"
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../install2.pm_.c:52 ../install_steps_interactive.pm_.c:450
-#: ../install_steps_interactive.pm_.c:451
+#: ../install2.pm_.c:52 ../install_steps_interactive.pm_.c:462
+#: ../install_steps_interactive.pm_.c:463
 msgid "Set root password"
 msgstr "Sett root-passord"
 
@@ -1125,7 +1137,26 @@ msgstr "ekspert"
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:269
+#: ../install2.pm_.c:268
+msgid " : This is not a root partition, try again."
+msgstr ""
+
+#: ../install2.pm_.c:268 ../install2.pm_.c:294
+#, fuzzy
+msgid "Information"
+msgstr "formatering"
+
+#: ../install2.pm_.c:294
+#, fuzzy
+msgid "Found root partition : "
+msgstr "Formater partisjoner"
+
+#: ../install2.pm_.c:315
+#, fuzzy
+msgid "No root partition found"
+msgstr "Formater partisjoner"
+
+#: ../install2.pm_.c:360
 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"
@@ -1133,15 +1164,15 @@ 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:286
+#: ../install2.pm_.c:381
 msgid "partitioning failed: no root filesystem"
 msgstr "partisjonering feilet: intet root-filsystem"
 
-#: ../install2.pm_.c:427
+#: ../install2.pm_.c:543
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../install2.pm_.c:432
+#: ../install2.pm_.c:548
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr "D�rlig kickstart-fil %s (mislykket %s)"
@@ -1150,6 +1181,10 @@ msgstr "D�rlig kickstart-fil %s (mislykket %s)"
 msgid "no floppy available"
 msgstr "ingen diskett tilgjengelig"
 
+#: ../install_steps_graphical.pm_.c:269
+msgid "Total size: "
+msgstr "Total st�rrelse: "
+
 #: ../install_steps_graphical.pm_.c:288
 msgid "Hide"
 msgstr "Gjem"
@@ -1170,14 +1205,6 @@ msgstr "Fjern alle valg"
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du �nsker � installere"
 
-#: ../install_steps_graphical.pm_.c:370
-msgid " Mb"
-msgstr "Mb"
-
-#: ../install_steps_graphical.pm_.c:370
-msgid "Total size: "
-msgstr "Total st�rrelse: "
-
 #: ../install_steps_graphical.pm_.c:371
 msgid "Info"
 msgstr "Info"
@@ -1207,13 +1234,13 @@ msgstr "forbereder installasjon"
 msgid "installing package %s"
 msgstr "installerer pakke %s"
 
-#: ../install_steps_graphical.pm_.c:459
-msgid "Package ordering failed"
-msgstr "Pakkelevering mislykket"
+#: ../install_steps_graphical.pm_.c:457
+msgid "Go on anyway?"
+msgstr ""
 
 #: ../install_steps_graphical.pm_.c:549 ../interactive.pm_.c:47
-#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:191 ../my_gtk.pm_.c:343
-#: ../my_gtk.pm_.c:427
+#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:346
+#: ../my_gtk.pm_.c:430
 msgid "Ok"
 msgstr "Ok"
 
@@ -1245,82 +1272,92 @@ msgstr "Installer"
 msgid "Upgrade"
 msgstr "Oppgrader"
 
+#: ../install_steps_interactive.pm_.c:83
+#, fuzzy
+msgid "Root Partition"
+msgstr "Formater partisjoner"
+
 #: ../install_steps_interactive.pm_.c:84
+#, fuzzy
+msgid "What is the root partition of your system?"
+msgstr "Hvilken partisjonstype �nsker du?"
+
+#: ../install_steps_interactive.pm_.c:93
 msgid "Install Class"
 msgstr "Installeringsklasse"
 
-#: ../install_steps_interactive.pm_.c:85
+#: ../install_steps_interactive.pm_.c:94
 msgid "What type of user will you have?"
 msgstr "Hva slags type bruker vil du ha?"
 
-#: ../install_steps_interactive.pm_.c:96
+#: ../install_steps_interactive.pm_.c:105
 msgid "Which mouse do you have"
 msgstr "Hvilken mus har du?"
 
-#: ../install_steps_interactive.pm_.c:100
+#: ../install_steps_interactive.pm_.c:109
 msgid "Emulate third button"
 msgstr "Emulere tredje knapp"
 
-#: ../install_steps_interactive.pm_.c:103
+#: ../install_steps_interactive.pm_.c:112
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../install_steps_interactive.pm_.c:104
+#: ../install_steps_interactive.pm_.c:113
 msgid "Which serial port is your mouse connected to?"
 msgstr "Hvilken serieport er musen din koblet til?"
 
-#: ../install_steps_interactive.pm_.c:114
+#: ../install_steps_interactive.pm_.c:123
 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:124
+#: ../install_steps_interactive.pm_.c:136
 msgid "Choose the partitions you want to format"
 msgstr "Velg de partisjonene du �nsker � formatere"
 
-#: ../install_steps_interactive.pm_.c:134
+#: ../install_steps_interactive.pm_.c:146
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formaterer partisjon %s"
 
-#: ../install_steps_interactive.pm_.c:142
+#: ../install_steps_interactive.pm_.c:154
 msgid "Searching for available packages"
 msgstr "S�ker etter tilgjengelige pakker"
 
-#: ../install_steps_interactive.pm_.c:153
+#: ../install_steps_interactive.pm_.c:165
 msgid "Keep the current IP configuration"
 msgstr "Behold n�v�rende IP-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:154
+#: ../install_steps_interactive.pm_.c:166
 msgid "Reconfigure network now"
 msgstr "Rekonfigurer nettverket n�"
 
-#: ../install_steps_interactive.pm_.c:155
+#: ../install_steps_interactive.pm_.c:167
 msgid "Don't set up networking"
 msgstr "Ikke sett opp nettverk"
 
-#: ../install_steps_interactive.pm_.c:157
-#: ../install_steps_interactive.pm_.c:163
+#: ../install_steps_interactive.pm_.c:169
+#: ../install_steps_interactive.pm_.c:175
 msgid "Network Configuration"
 msgstr "Nettverks-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:158
+#: ../install_steps_interactive.pm_.c:170
 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:164
+#: ../install_steps_interactive.pm_.c:176
 msgid ""
 "Do you want to configure LAN (not dialup) networking for your installed "
 "system?"
 msgstr ""
 "Vil du konfigurere LAN (ikke oppringt) nettverk for ditt installerte system?"
 
-#: ../install_steps_interactive.pm_.c:269
+#: ../install_steps_interactive.pm_.c:281
 msgid "Standard Printer Options"
 msgstr "Standard skriveropsjoner"
 
-#: ../install_steps_interactive.pm_.c:270
+#: ../install_steps_interactive.pm_.c:282
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
 "name (often lp) and a spool directory associated with it. What\n"
@@ -1330,40 +1367,40 @@ msgstr ""
 "(ofte lp) og en spolingskatalog assosiert til denne. Hvilket\n"
 "navn og katalog skal brukes for denne k�en?"
 
-#: ../install_steps_interactive.pm_.c:273
+#: ../install_steps_interactive.pm_.c:285
 msgid "Name of queue:"
 msgstr "K�ens navn:"
 
-#: ../install_steps_interactive.pm_.c:273
+#: ../install_steps_interactive.pm_.c:285
 msgid "Spool directory:"
 msgstr "Spolingskatalog:"
 
-#: ../install_steps_interactive.pm_.c:284
+#: ../install_steps_interactive.pm_.c:296
 msgid "Select Printer Connection"
 msgstr "Velg skrivertilkobling"
 
-#: ../install_steps_interactive.pm_.c:285
+#: ../install_steps_interactive.pm_.c:297
 msgid "How is the printer connected?"
 msgstr "Hvordan er skriveren tilkoblet?"
 
-#: ../install_steps_interactive.pm_.c:293
+#: ../install_steps_interactive.pm_.c:305
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
 
-#: ../install_steps_interactive.pm_.c:293
+#: ../install_steps_interactive.pm_.c:305
 msgid "Test ports"
 msgstr "Test porter"
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:318
 #, c-format
 msgid "I have detected a %s on "
 msgstr "Jeg har oppdaget en %s p� "
 
-#: ../install_steps_interactive.pm_.c:313
+#: ../install_steps_interactive.pm_.c:325
 msgid "Local Printer Device"
 msgstr "Lokal skriverenhet"
 
-#: ../install_steps_interactive.pm_.c:314
+#: ../install_steps_interactive.pm_.c:326
 msgid ""
 "What device is your printer connected to  \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -1371,15 +1408,15 @@ msgstr ""
 "Hvilken enhet er skriveren din koblet til  \n"
 "(merk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#: ../install_steps_interactive.pm_.c:315
+#: ../install_steps_interactive.pm_.c:327
 msgid "Printer Device:"
 msgstr "Skriverenhet:"
 
-#: ../install_steps_interactive.pm_.c:321
+#: ../install_steps_interactive.pm_.c:333
 msgid "Remote lpd Printer Options"
 msgstr "Fjern-lpd skriveropsjoner"
 
-#: ../install_steps_interactive.pm_.c:322
+#: ../install_steps_interactive.pm_.c:334
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -1389,19 +1426,19 @@ msgstr ""
 "til skrivertjeneren og k�navnet til den tjeneren\n"
 "som jobbene skal plasseres i."
 
-#: ../install_steps_interactive.pm_.c:325
+#: ../install_steps_interactive.pm_.c:337
 msgid "Remote hostname:"
 msgstr "Fjern-brukernavn:"
 
-#: ../install_steps_interactive.pm_.c:325
+#: ../install_steps_interactive.pm_.c:337
 msgid "Remote queue:"
 msgstr "Fjern-k�:"
 
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:343
 msgid "SMB/Windows 95/NT Printer Options"
 msgstr "SMB/Windows 95/NT skriveropsjoner"
 
-#: ../install_steps_interactive.pm_.c:332
+#: ../install_steps_interactive.pm_.c:344
 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"
@@ -1415,41 +1452,41 @@ msgstr ""
 "navnet til skriveren du �nsker tilgang til og anvendelige brukernavn,\n"
 "passord, og arbeidsgruppeinformasjon."
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:349
 msgid "SMB server IP:"
 msgstr "SMB-tjener IP:"
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:349
 msgid "SMB server host:"
 msgstr "SMB-tjener vert:"
 
-#: ../install_steps_interactive.pm_.c:338
-#: ../install_steps_interactive.pm_.c:360
+#: ../install_steps_interactive.pm_.c:350
+#: ../install_steps_interactive.pm_.c:372
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../install_steps_interactive.pm_.c:338
+#: ../install_steps_interactive.pm_.c:350
 msgid "Share name:"
 msgstr "Delt navn:"
 
-#: ../install_steps_interactive.pm_.c:338
-#: ../install_steps_interactive.pm_.c:360
+#: ../install_steps_interactive.pm_.c:350
+#: ../install_steps_interactive.pm_.c:372
 msgid "User name:"
 msgstr "Brukernavn:"
 
-#: ../install_steps_interactive.pm_.c:339
+#: ../install_steps_interactive.pm_.c:351
 msgid "Workgroup:"
 msgstr "Arbeidsgruppe:"
 
-#: ../install_steps_interactive.pm_.c:346
+#: ../install_steps_interactive.pm_.c:358
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse b�r v�re i format 1.2.3.4"
 
-#: ../install_steps_interactive.pm_.c:354
+#: ../install_steps_interactive.pm_.c:366
 msgid "NetWare Printer Options"
 msgstr "NetWare skriveropsjoner"
 
-#: ../install_steps_interactive.pm_.c:355
+#: ../install_steps_interactive.pm_.c:367
 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"
@@ -1461,105 +1498,105 @@ msgstr ""
 "vertsnavn) s� vel som navnet p� skriverk�en til skriveren du �nsker\n"
 "adgang til og anvendelige brukernavn og passord."
 
-#: ../install_steps_interactive.pm_.c:359
+#: ../install_steps_interactive.pm_.c:371
 msgid "Print Queue Name:"
 msgstr "Skriverk� navn:"
 
-#: ../install_steps_interactive.pm_.c:359
+#: ../install_steps_interactive.pm_.c:371
 msgid "Printer Server:"
 msgstr "Skrivertjener:"
 
-#: ../install_steps_interactive.pm_.c:370
+#: ../install_steps_interactive.pm_.c:382
 msgid "Configure Printer"
 msgstr "Konfigurer skriver"
 
-#: ../install_steps_interactive.pm_.c:371
+#: ../install_steps_interactive.pm_.c:383
 msgid "What type of printer do you have?"
 msgstr "Hva slags type skriver har du?"
 
-#: ../install_steps_interactive.pm_.c:382
-#: ../install_steps_interactive.pm_.c:383
+#: ../install_steps_interactive.pm_.c:394
+#: ../install_steps_interactive.pm_.c:395
 msgid "Paper Size"
 msgstr "Papirst�rrelse"
 
-#: ../install_steps_interactive.pm_.c:402
+#: ../install_steps_interactive.pm_.c:414
 msgid "CRLF"
 msgstr "CRLF"
 
-#: ../install_steps_interactive.pm_.c:403
+#: ../install_steps_interactive.pm_.c:415
 msgid "Fix stair-stepping of text?"
 msgstr "Fiks trappesteging av tekst?"
 
-#: ../install_steps_interactive.pm_.c:419
+#: ../install_steps_interactive.pm_.c:431
 msgid "Configure Uniprint Driver"
 msgstr "Konfigurer Uniprint-driver"
 
-#: ../install_steps_interactive.pm_.c:420
+#: ../install_steps_interactive.pm_.c:432
 msgid "You may now configure the uniprint options for this printer."
 msgstr "Du kan n� konfigurere uniprint-opsjonene for denne skriveren."
 
-#: ../install_steps_interactive.pm_.c:428
+#: ../install_steps_interactive.pm_.c:440
 msgid "Configure Color Depth"
 msgstr "Konfigurer fargedybde"
 
-#: ../install_steps_interactive.pm_.c:429
+#: ../install_steps_interactive.pm_.c:441
 msgid "You may now configure the color options for this printer."
 msgstr "Du kan n� konfigurere fargeopsjonene for denne skriveren."
 
-#: ../install_steps_interactive.pm_.c:452
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:464
+#: ../install_steps_interactive.pm_.c:489
 msgid "Password"
 msgstr "Passord"
 
-#: ../install_steps_interactive.pm_.c:452
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:464
+#: ../install_steps_interactive.pm_.c:489
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: ../install_steps_interactive.pm_.c:456
-#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:500
 msgid "Please try again"
 msgstr "Vennligst pr�v igjen"
 
-#: ../install_steps_interactive.pm_.c:456
-#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:500
 msgid "You must enter the same password"
 msgstr "Du m� skrive inn det samme passordet"
 
-#: ../install_steps_interactive.pm_.c:457
+#: ../install_steps_interactive.pm_.c:469
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../install_steps_interactive.pm_.c:475
+#: ../install_steps_interactive.pm_.c:487
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../install_steps_interactive.pm_.c:476
+#: ../install_steps_interactive.pm_.c:488
 msgid "Enter a user"
 msgstr "Entre en bruker"
 
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:489
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:489
 msgid "Shell"
 msgstr "Skall"
 
-#: ../install_steps_interactive.pm_.c:477
+#: ../install_steps_interactive.pm_.c:489
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:502
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../install_steps_interactive.pm_.c:491
+#: ../install_steps_interactive.pm_.c:503
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde sm� bokstaver, tall, `-' og `_'"
 
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:522
 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 "
@@ -1583,125 +1620,129 @@ msgstr ""
 "systemsvikt.\n"
 "�nsker du � opprette en oppstartsdiskett for systemet ditt?"
 
-#: ../install_steps_interactive.pm_.c:518
+#: ../install_steps_interactive.pm_.c:530
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../install_steps_interactive.pm_.c:521
+#: ../install_steps_interactive.pm_.c:533
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du �nsker � bruke for � lage oppstartsdisketten"
 
-#: ../install_steps_interactive.pm_.c:526
+#: ../install_steps_interactive.pm_.c:538
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../install_steps_interactive.pm_.c:527
+#: ../install_steps_interactive.pm_.c:539
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:546
 msgid "Preparing bootloader"
 msgstr "Klargj�r oppstartslaster"
 
-#: ../install_steps_interactive.pm_.c:543
+#: ../install_steps_interactive.pm_.c:555
 msgid "First sector of boot partition"
 msgstr "F�rste sektor av oppstartspartisjon"
 
-#: ../install_steps_interactive.pm_.c:543
+#: ../install_steps_interactive.pm_.c:555
 msgid "First sector of drive"
 msgstr "F�rste sektor av disk"
 
-#: ../install_steps_interactive.pm_.c:548
+#: ../install_steps_interactive.pm_.c:560
 msgid "Lilo Installation"
 msgstr "Lilo-installasjon"
 
-#: ../install_steps_interactive.pm_.c:549
+#: ../install_steps_interactive.pm_.c:561
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor vil du installere oppstartslasteren?"
 
-#: ../install_steps_interactive.pm_.c:552
+#: ../install_steps_interactive.pm_.c:564
 msgid "Do you want to use lilo?"
 msgstr "�nsker du � bruke lilo?"
 
-#: ../install_steps_interactive.pm_.c:556
+#: ../install_steps_interactive.pm_.c:568
 msgid "linear"
 msgstr "line�r"
 
-#: ../install_steps_interactive.pm_.c:557
+#: ../install_steps_interactive.pm_.c:569
 msgid "compact"
 msgstr "kompakt"
 
-#: ../install_steps_interactive.pm_.c:561
+#: ../install_steps_interactive.pm_.c:573
 msgid "restrict"
 msgstr "begrense"
 
-#: ../install_steps_interactive.pm_.c:567
+#: ../install_steps_interactive.pm_.c:579
 msgid "Lilo main options"
 msgstr "Lilo hovedopsjoner"
 
-#: ../install_steps_interactive.pm_.c:571
+#: ../install_steps_interactive.pm_.c:583
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../install_steps_interactive.pm_.c:582
+#: ../install_steps_interactive.pm_.c:594
 msgid "Add"
 msgstr "Legg til"
 
-#: ../install_steps_interactive.pm_.c:660
+#: ../install_steps_interactive.pm_.c:646
+msgid "Lilo failed. The following error occured:"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:678
 #, c-format
 msgid "What %s card have you?"
 msgstr "Hvilket %s kort har du?"
 
-#: ../install_steps_interactive.pm_.c:672
+#: ../install_steps_interactive.pm_.c:690
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: ../install_steps_interactive.pm_.c:672
+#: ../install_steps_interactive.pm_.c:690
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: ../install_steps_interactive.pm_.c:685
+#: ../install_steps_interactive.pm_.c:703
 msgid "Module options:"
 msgstr "Modulopsjoner:"
 
-#: ../install_steps_interactive.pm_.c:705
+#: ../install_steps_interactive.pm_.c:723
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for %s kort %s"
 
-#: ../install_steps_interactive.pm_.c:706
+#: ../install_steps_interactive.pm_.c:724
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
-#: ../install_steps_interactive.pm_.c:718
+#: ../install_steps_interactive.pm_.c:736
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../install_steps_interactive.pm_.c:719
+#: ../install_steps_interactive.pm_.c:737
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../install_steps_interactive.pm_.c:720
+#: ../install_steps_interactive.pm_.c:738
 #, c-format
 msgid "Do you have an %s interface?"
 msgstr "Har du et %s grensesnitt?"
 
-#: ../install_steps_interactive.pm_.c:722 ../interactive.pm_.c:52
-#: ../my_gtk.pm_.c:342
+#: ../install_steps_interactive.pm_.c:740 ../interactive.pm_.c:52
+#: ../my_gtk.pm_.c:345
 msgid "No"
 msgstr "Nei"
 
-#: ../install_steps_interactive.pm_.c:722 ../interactive.pm_.c:52
-#: ../my_gtk.pm_.c:342
+#: ../install_steps_interactive.pm_.c:740 ../interactive.pm_.c:52
+#: ../my_gtk.pm_.c:345
 msgid "Yes"
 msgstr "Ja"
 
-#: ../install_steps_interactive.pm_.c:723
+#: ../install_steps_interactive.pm_.c:741
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
@@ -1710,7 +1751,7 @@ msgstr "Se maskinvareinfo"
 msgid "Starting step `%s'\n"
 msgstr "Starter steg `%s'\n"
 
-#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:343
+#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:195 ../my_gtk.pm_.c:346
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1863,123 +1904,123 @@ msgstr "US-tastatur"
 msgid "Yugoslavian (latin layout)"
 msgstr "Jugoslavisk (latinsk oppsett)"
 
-#: ../mouse.pm_.c:14
+#: ../mouse.pm_.c:15
 msgid "No Mouse"
 msgstr "Ingen mus"
 
-#: ../mouse.pm_.c:15
+#: ../mouse.pm_.c:16
 msgid "Microsoft Rev 2.1A or higher (serial)"
 msgstr "Microsoft Rev 2.1A eller h�yere (seriell)"
 
-#: ../mouse.pm_.c:16
+#: ../mouse.pm_.c:17
 msgid "Logitech CC Series (serial)"
 msgstr "Logitech CC-seriene (seriell)"
 
-#: ../mouse.pm_.c:17
+#: ../mouse.pm_.c:18
 msgid "Logitech MouseMan+/FirstMouse+ (serial)"
 msgstr "Logitech MouseMan+/FirstMouse+ (seriell)"
 
-#: ../mouse.pm_.c:18
+#: ../mouse.pm_.c:19
 msgid "ASCII MieMouse (serial)"
 msgstr "ASCII MieMouse (seriell)"
 
-#: ../mouse.pm_.c:19
+#: ../mouse.pm_.c:20
 msgid "Genius NetMouse (serial)"
 msgstr "Genius NetMouse (seriell)"
 
-#: ../mouse.pm_.c:20
+#: ../mouse.pm_.c:21
 msgid "Microsoft IntelliMouse (serial)"
 msgstr "Microsoft IntelliMouse (seriell)"
 
-#: ../mouse.pm_.c:21
+#: ../mouse.pm_.c:22
 msgid "MM Series (serial)"
 msgstr "MM-seriene (seriell)"
 
-#: ../mouse.pm_.c:22
+#: ../mouse.pm_.c:23
 msgid "MM HitTablet (serial)"
 msgstr "MM HitTablet (seriell)"
 
-#: ../mouse.pm_.c:23
+#: ../mouse.pm_.c:24
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (seriell, gammel C7 type)"
 
-#: ../mouse.pm_.c:24
+#: ../mouse.pm_.c:25
 msgid "Logitech MouseMan/FirstMouse (serial)"
 msgstr "Logitech MouseMan/FirstMouse (seriell)"
 
-#: ../mouse.pm_.c:25
+#: ../mouse.pm_.c:26
 msgid "Generic Mouse (serial)"
 msgstr "Generic Mouse (seriell)"
 
-#: ../mouse.pm_.c:26
+#: ../mouse.pm_.c:27
 msgid "Microsoft compatible (serial)"
 msgstr "Microsoft-kompatibel (seriell)"
 
-#: ../mouse.pm_.c:27
+#: ../mouse.pm_.c:28
 msgid "Generic 3 Button Mouse (serial)"
 msgstr "Generic 3-knappers mus (seriell)"
 
-#: ../mouse.pm_.c:28
+#: ../mouse.pm_.c:29
 msgid "Mouse Systems (serial)"
 msgstr "Mouse Systems (seriell)"
 
-#: ../mouse.pm_.c:29
+#: ../mouse.pm_.c:30
 msgid "Generic Mouse (PS/2)"
 msgstr "Generic Mouse (PS/2)"
 
-#: ../mouse.pm_.c:30
+#: ../mouse.pm_.c:31
 msgid "Logitech MouseMan/FirstMouse (ps/2)"
 msgstr "Logitech MouseMan/FirstMouse (ps/2)"
 
-#: ../mouse.pm_.c:31
+#: ../mouse.pm_.c:32
 msgid "Generic 3 Button Mouse (PS/2)"
 msgstr "Generic 3-knappers mus (PS/2)"
 
-#: ../mouse.pm_.c:32
+#: ../mouse.pm_.c:33
 msgid "ALPS GlidePoint (PS/2)"
 msgstr "ALPS GlidePoint (PS/2)"
 
-#: ../mouse.pm_.c:33
+#: ../mouse.pm_.c:34
 msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
 msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
 
-#: ../mouse.pm_.c:34
+#: ../mouse.pm_.c:35
 msgid "Kensington Thinking Mouse (PS/2)"
 msgstr "Kensington Thinking Mouse (PS/2)"
 
-#: ../mouse.pm_.c:35
+#: ../mouse.pm_.c:36
 msgid "ASCII MieMouse (PS/2)"
 msgstr "ASCII MieMouse (PS/2)"
 
-#: ../mouse.pm_.c:36
+#: ../mouse.pm_.c:37
 msgid "Genius NetMouse (PS/2)"
 msgstr "Genius NetMouse (PS/2)"
 
-#: ../mouse.pm_.c:37
+#: ../mouse.pm_.c:38
 msgid "Genius NetMouse Pro (PS/2)"
 msgstr "Genius NetMouse Pro (PS/2)"
 
-#: ../mouse.pm_.c:38
+#: ../mouse.pm_.c:39
 msgid "Genius NetScroll (PS/2)"
 msgstr "Genius NetScroll (PS/2)"
 
-#: ../mouse.pm_.c:39
+#: ../mouse.pm_.c:40
 msgid "Microsoft IntelliMouse (PS/2)"
 msgstr "Microsoft IntelliMouse (PS/2)"
 
-#: ../mouse.pm_.c:40
+#: ../mouse.pm_.c:41
 msgid "ATI Bus Mouse"
 msgstr "ATI Bus Mouse"
 
-#: ../mouse.pm_.c:41
+#: ../mouse.pm_.c:42
 msgid "Microsoft Bus Mouse"
 msgstr "Microsoft Bus Mouse"
 
-#: ../mouse.pm_.c:42
+#: ../mouse.pm_.c:43
 msgid "Logitech Bus Mouse"
 msgstr "Logitech Bus Mouse"
 
-#: ../my_gtk.pm_.c:343
+#: ../my_gtk.pm_.c:346
 msgid "Is it ok?"
 msgstr "Er det ok?"
 
@@ -2002,6 +2043,12 @@ msgstr "D�rlig sikkerhetskopi-fil"
 msgid "Error writing to file %s"
 msgstr "Feil ved skriving til fil %s"
 
+#~ msgid " Mb"
+#~ msgstr "Mb"
+
+#~ msgid "Package ordering failed"
+#~ msgstr "Pakkelevering mislykket"
+
 #~ msgid ""
 #~ "Congratulations, installation is complete.\n"
 #~ "Remove the boot media and press return to reboot.\n"
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index 6330cb325..e5851b1dd 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -17,6 +17,13 @@ sub getTimeZones {
     @l;
 }
 
+sub read ($) {
+    my ($f) = @_;
+    my %t = getVarsFromSh($f) or die "cannot open file $f: $!";
+
+    ("timezone", $t{ZONE}, "GMT", text2bool($t{GMT}));
+}
+
 sub write($$$) {
     my ($prefix, $t, $f) = @_;