no_comment

6 files changed, 194 insertions, 186 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d429802e1..04c8b7d99 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -14,6 +14,7 @@ use common qw(:common :file :system :functional);
 use install_any qw(:all);
 use log;
 use help;
+use commands;
 use network;
 use lang;
 use keyboard;
@@ -181,8 +182,8 @@ $o = $::o = {
     steps        => \%installSteps,
     orderedSteps => \@orderedInstallSteps,
 
-#-GOLD    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
-    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
+    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
+#-GOLD    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
 
 #- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
 #-    intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
@@ -323,6 +324,8 @@ sub formatPartitions {
       qw(dev etc etc/profile.d etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
 	home mnt tmp var var/tmp var/lib var/lib/rpm);
     mkdir "$o->{prefix}/$_", 0700 foreach qw(root);
+
+    eval { commands::cp("-f", "/etc/raidtab", "$o->{prefix}/etc/raidtab") } if !is_empty_hash_ref($o->{raid});
 }
 
 #------------------------------------------------------------------------------
@@ -491,8 +494,6 @@ sub main {
     log::l("second stage install running");
     log::ld("extra log messages are enabled");
 
-    #-really needed ??
-    #-spawnSync();
     eval { spawnShell() };
 
     $o->{prefix} = $::testing ? "/tmp/test-perl-install" : "/mnt";
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d02a80608..ef36e6fca 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK);
 
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
-    all => [ qw(getNextStep spawnSync spawnShell addToBeDone) ],
+    all => [ qw(getNextStep spawnShell addToBeDone) ],
 );
 @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
 
@@ -65,12 +65,6 @@ sub getNextStep {
     $s;
 }
 
-sub spawnSync {
-    return if $::o->{localInstall} || $::testing;
-    fork and return;
-    while (1) { sleep(30); sync(); }
-}
-
 sub spawnShell {
     return if $::o->{localInstall} || $::testing;
 
@@ -129,6 +123,7 @@ sub setPackages($) {
 	$o->{compssUsers} = pkgs::readCompssUsers($o->{packages}, $o->{compss});
 	push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP();
 	push @{$o->{base}}, "kernel-pcmcia-cs" if $o->{pcmcia};
+	push @{$o->{base}}, "raidtools" if !is_empty_hash_ref($o->{raid});
 
 	grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages";
     } else {
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 652f3f81f..094481c3a 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -16,7 +16,7 @@ use partition_table_raw;
 use Data::Dumper;
 
 
-@important_types = ("Linux native", "Linux swap", "DOS FAT16", "Win98 FAT32");
+@important_types = ('Linux native', 'Linux swap', 'DOS FAT16', 'Win98 FAT32', 'Linux RAID');
 
 @fields2save = qw(primary extended totalsectors);
 
@@ -132,7 +132,7 @@ my %types = (
   0xf2 => 'DOS 3.3+ secondary partition',
   0xf4 => 'SpeedStor large partition / Prologue single-volume partition',
   0xf5 => 'Prologue multi-volume partition',
-  0xfd => 'Linux raid partition with autodetect using persistent superblock',
+  0xfd => 'Linux RAID',
   0xfe => 'SpeedStor > 1024 cyl. or LANstep / IBM PS/2 IML (Initial Microcode Load) partition, located at the end of the disk. / Windows NT Disk Administrator hidden partition / Linux Logical Volume Manager partition (old)',
   0xff => 'Xenix Bad Block Table',
 );
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 45d58c750..8b4fb4c8e 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -30,7 +30,7 @@ sub new($$) {
 }
 
 sub add($$$) {
-    my ($raid, $part, $nb) = @_;
+    my ($raid, $part, $nb) = @_; $nb = nb($nb);
     $raid->[$nb]{isMounted} and die _("Can't add a partition to _formatted_ RAID md%d", $nb);
     $part->{raid} = $nb;
     push @{$raid->[$nb]{disks}}, $part;
@@ -44,6 +44,16 @@ sub delete($$) {
     $raid->[$nb] = undef;
 }
 
+sub changeNb($$$) {
+    my ($raid, $oldnb, $newnb) = @_;
+    if ($oldnb != $newnb) {
+	($raid->[$newnb], $raid->[$oldnb]) = ($raid->[$oldnb], undef);
+	$raid->[$newnb]{device} = "md$newnb";
+	$_->{raid} = $newnb foreach @{$raid->[$newnb]{disks}};
+    }
+    $newnb;
+}
+
 sub removeDisk($$) {
     my ($raid, $part) = @_;
     my $nb = nb($part->{raid});
@@ -78,9 +88,11 @@ sub updateIsFormatted($) {
     $part->{isFormatted}  = and_ map { $_->{isFormatted}  } @{$part->{disks}};
     $part->{notFormatted} = and_ map { $_->{notFormatted} } @{$part->{disks}};
 }
-sub update($) {
-    &updateSize;
-    &updateIsFormatted;
+sub update {
+    foreach (@_) {
+	updateSize($_);
+	updateIsFormatted($_);
+    }
 }
 
 sub write($) {
@@ -123,7 +135,7 @@ sub format_part($$) {
 sub verify($) {
     my ($raid) = @_;
     $raid && $raid->{raid} or return;
-    foreach (@{$raid->{raid}}) {
+    foreach (grep {$_} @{$raid->{raid}}) {
 	@{$_->{disks}} >= ($_->{level} =~ /4|5/ ? 3 : 2) or die _("Not enough partitions for RAID level %d\n", $_->{level});
     }
 }
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 2b9fba318..15f92dcde 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-09 14:08+0100\n"
+"POT-Creation-Date: 1999-11-09 16:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,23 +14,23 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../Xconfigurator.pm_.c:162
+#: ../Xconfigurator.pm_.c:158
 msgid "Select a graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:163
+#: ../Xconfigurator.pm_.c:159
 msgid "Choose a X server"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:182
+#: ../Xconfigurator.pm_.c:178
 msgid "Select the memory size of your graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:203
+#: ../Xconfigurator.pm_.c:199
 msgid "Choose a monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:206
+#: ../Xconfigurator.pm_.c:202
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -44,176 +44,176 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:213
+#: ../Xconfigurator.pm_.c:209
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:213
+#: ../Xconfigurator.pm_.c:209
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:254
+#: ../Xconfigurator.pm_.c:250
 msgid "Monitor not configured"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:257
+#: ../Xconfigurator.pm_.c:253
 msgid "Graphic card not configured yet"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:260
+#: ../Xconfigurator.pm_.c:256
 msgid "Resolutions not chosen yet"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:265
 msgid "Do you want to test the configuration?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:265
 msgid "Test configuration"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:301
+#: ../Xconfigurator.pm_.c:297
 msgid "An error occurred:"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:303
+#: ../Xconfigurator.pm_.c:299
 msgid ""
 "\n"
 "try changing some parameters"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:324
+#: ../Xconfigurator.pm_.c:320
 #, c-format
 msgid "(leaving in %d seconds)"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:328 ../install_steps_interactive.pm_.c:571
+#: ../Xconfigurator.pm_.c:324 ../install_steps_interactive.pm_.c:571
 #: ../my_gtk.pm_.c:437
 msgid "Is this correct?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:336
+#: ../Xconfigurator.pm_.c:332
 msgid "An error occurred, try changing some parameters"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:344 ../Xconfigurator.pm_.c:509
+#: ../Xconfigurator.pm_.c:340 ../Xconfigurator.pm_.c:505
 msgid "Automatic resolutions"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:345
+#: ../Xconfigurator.pm_.c:341
 msgid ""
 "To find the available resolutions I will try different ones.\n"
 "Your screen will blink...\n"
 "You can switch if off if you want, you'll hear a beep when it's over"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:536
+#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:536
 msgid "Resolution"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:431
+#: ../Xconfigurator.pm_.c:427
 msgid "Choose resolution and color depth"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:439
+#: ../Xconfigurator.pm_.c:435
 msgid "Show all"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:510
+#: ../Xconfigurator.pm_.c:506
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
 "Do you want to try?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:515
+#: ../Xconfigurator.pm_.c:511
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:703
+#: ../Xconfigurator.pm_.c:699
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:704
+#: ../Xconfigurator.pm_.c:700
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:705
+#: ../Xconfigurator.pm_.c:701
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:706
+#: ../Xconfigurator.pm_.c:702
 #, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:707
+#: ../Xconfigurator.pm_.c:703
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:708
+#: ../Xconfigurator.pm_.c:704
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:709
+#: ../Xconfigurator.pm_.c:705
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:710
+#: ../Xconfigurator.pm_.c:706
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:711
+#: ../Xconfigurator.pm_.c:707
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:736
+#: ../Xconfigurator.pm_.c:732
 msgid "Change Monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:737
+#: ../Xconfigurator.pm_.c:733
 msgid "Change Graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:738
+#: ../Xconfigurator.pm_.c:734
 msgid "Change Resolution"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:735
 msgid "Automatical resolutions search"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:743
+#: ../Xconfigurator.pm_.c:739
 msgid "Show information"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:744
+#: ../Xconfigurator.pm_.c:740
 msgid "Test again"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:745
+#: ../Xconfigurator.pm_.c:741
 msgid "Quit"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:748
+#: ../Xconfigurator.pm_.c:744
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:753
+#: ../Xconfigurator.pm_.c:749
 msgid "X at startup"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:754
+#: ../Xconfigurator.pm_.c:750
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -467,7 +467,7 @@ msgstr ""
 msgid "all data on this partition will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:177 ../install_steps.pm_.c:71
+#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:172 ../install_steps.pm_.c:71
 #: ../install_steps_interactive.pm_.c:41
 msgid "Error"
 msgstr ""
@@ -742,11 +742,11 @@ msgstr ""
 msgid "chunk size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:658
+#: ../diskdrake.pm_.c:653
 msgid "Choose an existent RAID to add to"
 msgstr ""
 
-#: ../diskdrake.pm_.c:659
+#: ../diskdrake.pm_.c:654
 msgid "new"
 msgstr ""
 
@@ -941,7 +941,7 @@ msgid ""
 msgstr ""
 
 #: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:399
-#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:67
+#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:68
 msgid "Help"
 msgstr ""
 
@@ -1121,145 +1121,145 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../install2.pm_.c:40
+#: ../install2.pm_.c:41
 msgid "Choose your language"
 msgstr ""
 
-#: ../install2.pm_.c:41
+#: ../install2.pm_.c:42
 msgid "Select installation class"
 msgstr ""
 
-#: ../install2.pm_.c:42
+#: ../install2.pm_.c:43
 msgid "Setup SCSI"
 msgstr ""
 
-#: ../install2.pm_.c:43
+#: ../install2.pm_.c:44
 msgid "Choose install or upgrade"
 msgstr ""
 
-#: ../install2.pm_.c:44
+#: ../install2.pm_.c:45
 msgid "Configure mouse"
 msgstr ""
 
-#: ../install2.pm_.c:45
+#: ../install2.pm_.c:46
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../install2.pm_.c:46
+#: ../install2.pm_.c:47
 msgid "Setup filesystems"
 msgstr ""
 
-#: ../install2.pm_.c:47
+#: ../install2.pm_.c:48
 msgid "Format partitions"
 msgstr ""
 
-#: ../install2.pm_.c:48
+#: ../install2.pm_.c:49
 msgid "Choose packages to install"
 msgstr ""
 
-#: ../install2.pm_.c:49
+#: ../install2.pm_.c:50
 msgid "Install system"
 msgstr ""
 
-#: ../install2.pm_.c:50
+#: ../install2.pm_.c:51
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../install2.pm_.c:51
+#: ../install2.pm_.c:52
 msgid "Configure networking"
 msgstr ""
 
-#: ../install2.pm_.c:52
+#: ../install2.pm_.c:53
 msgid "Configure timezone"
 msgstr ""
 
-#: ../install2.pm_.c:54
+#: ../install2.pm_.c:55
 msgid "Configure printer"
 msgstr ""
 
-#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:586
+#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:586
 #: ../install_steps_interactive.pm_.c:587
 msgid "Set root password"
 msgstr ""
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:57
 msgid "Add a user"
 msgstr ""
 
-#: ../install2.pm_.c:57
+#: ../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr ""
 
-#: ../install2.pm_.c:58
+#: ../install2.pm_.c:59
 msgid "Install bootloader"
 msgstr ""
 
-#: ../install2.pm_.c:59
+#: ../install2.pm_.c:60
 msgid "Configure X"
 msgstr ""
 
-#: ../install2.pm_.c:60
+#: ../install2.pm_.c:61
 msgid "Exit install"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "beginner"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "developer"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "expert"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "server"
 msgstr ""
 
-#: ../install2.pm_.c:306
+#: ../install2.pm_.c:307
 msgid "Partitioning failed: no root filesystem"
 msgstr ""
 
-#: ../install2.pm_.c:316
+#: ../install2.pm_.c:317
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../install_any.pm_.c:178
+#: ../install_any.pm_.c:173
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
 msgstr ""
 
-#: ../install_any.pm_.c:194
+#: ../install_any.pm_.c:189
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
 
-#: ../install_any.pm_.c:233
+#: ../install_any.pm_.c:228
 msgid "Information"
 msgstr ""
 
-#: ../install_any.pm_.c:234
+#: ../install_any.pm_.c:229
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr ""
 
-#: ../install_any.pm_.c:236
+#: ../install_any.pm_.c:231
 msgid "No root partition found"
 msgstr ""
 
-#: ../install_any.pm_.c:272
+#: ../install_any.pm_.c:267
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../install_any.pm_.c:420
+#: ../install_any.pm_.c:415
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../install_any.pm_.c:425
+#: ../install_any.pm_.c:420
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr ""
@@ -2673,11 +2673,11 @@ msgstr ""
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../raid.pm_.c:92
+#: ../raid.pm_.c:104
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../raid.pm_.c:127
+#: ../raid.pm_.c:139
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 011793082..1718896bb 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 1999-11-09 14:08+0100\n"
+"POT-Creation-Date: 1999-11-09 16:28+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -13,23 +13,23 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../Xconfigurator.pm_.c:162
+#: ../Xconfigurator.pm_.c:158
 msgid "Select a graphic card"
 msgstr "Velg et grafikk-kort"
 
-#: ../Xconfigurator.pm_.c:163
+#: ../Xconfigurator.pm_.c:159
 msgid "Choose a X server"
 msgstr "Velg en X-tjener"
 
-#: ../Xconfigurator.pm_.c:182
+#: ../Xconfigurator.pm_.c:178
 msgid "Select the memory size of your graphic card"
 msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
 
-#: ../Xconfigurator.pm_.c:203
+#: ../Xconfigurator.pm_.c:199
 msgid "Choose a monitor"
 msgstr "Velg en monitor"
 
-#: ../Xconfigurator.pm_.c:206
+#: ../Xconfigurator.pm_.c:202
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -53,39 +53,39 @@ msgstr ""
 "skjermen din.\n"
 "Hvis du er usikker, velg en konservativ innstilling."
 
-#: ../Xconfigurator.pm_.c:213
+#: ../Xconfigurator.pm_.c:209
 msgid "Horizontal refresh rate"
 msgstr "Horisontal oppfrisknings-rate"
 
-#: ../Xconfigurator.pm_.c:213
+#: ../Xconfigurator.pm_.c:209
 msgid "Vertical refresh rate"
 msgstr "Vertikal oppfrisknings-rate"
 
-#: ../Xconfigurator.pm_.c:254
+#: ../Xconfigurator.pm_.c:250
 msgid "Monitor not configured"
 msgstr "Monitor er ikke konfigurert"
 
-#: ../Xconfigurator.pm_.c:257
+#: ../Xconfigurator.pm_.c:253
 msgid "Graphic card not configured yet"
 msgstr "Grafikk-kort er ikke konfigurert ennå"
 
-#: ../Xconfigurator.pm_.c:260
+#: ../Xconfigurator.pm_.c:256
 msgid "Resolutions not chosen yet"
 msgstr "Oppløsninger er ikke valgt ennå"
 
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:265
 msgid "Do you want to test the configuration?"
 msgstr "Vil du teste konfigurasjonen?"
 
-#: ../Xconfigurator.pm_.c:269
+#: ../Xconfigurator.pm_.c:265
 msgid "Test configuration"
 msgstr "Test konfigurasjon"
 
-#: ../Xconfigurator.pm_.c:301
+#: ../Xconfigurator.pm_.c:297
 msgid "An error occurred:"
 msgstr "En feil oppsto:"
 
-#: ../Xconfigurator.pm_.c:303
+#: ../Xconfigurator.pm_.c:299
 msgid ""
 "\n"
 "try changing some parameters"
@@ -93,25 +93,25 @@ msgstr ""
 "\n"
 "prøv å endre noen parametere"
 
-#: ../Xconfigurator.pm_.c:324
+#: ../Xconfigurator.pm_.c:320
 #, c-format
 msgid "(leaving in %d seconds)"
 msgstr "(slutter om %d sekunder)"
 
-#: ../Xconfigurator.pm_.c:328 ../install_steps_interactive.pm_.c:571
+#: ../Xconfigurator.pm_.c:324 ../install_steps_interactive.pm_.c:571
 #: ../my_gtk.pm_.c:437
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
-#: ../Xconfigurator.pm_.c:336
+#: ../Xconfigurator.pm_.c:332
 msgid "An error occurred, try changing some parameters"
 msgstr "En feil oppsto, prøv å endre noen parametere"
 
-#: ../Xconfigurator.pm_.c:344 ../Xconfigurator.pm_.c:509
+#: ../Xconfigurator.pm_.c:340 ../Xconfigurator.pm_.c:505
 msgid "Automatic resolutions"
 msgstr "Automatiske oppløsninger"
 
-#: ../Xconfigurator.pm_.c:345
+#: ../Xconfigurator.pm_.c:341
 msgid ""
 "To find the available resolutions I will try different ones.\n"
 "Your screen will blink...\n"
@@ -121,19 +121,19 @@ msgstr ""
 "Skjermen din vil blinke...\n"
 "Du kan slå av hvis du vil, du vil høre et bipp når det er ferdig"
 
-#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:536
+#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:536
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../Xconfigurator.pm_.c:431
+#: ../Xconfigurator.pm_.c:427
 msgid "Choose resolution and color depth"
 msgstr "Velg oppløsning og fargedybde"
 
-#: ../Xconfigurator.pm_.c:439
+#: ../Xconfigurator.pm_.c:435
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../Xconfigurator.pm_.c:510
+#: ../Xconfigurator.pm_.c:506
 msgid ""
 "I can try to find the available resolutions (eg: 800x600).\n"
 "Sometimes, though, it may hang the machine.\n"
@@ -143,7 +143,7 @@ msgstr ""
 "Noen ganger kan dette forårsake at maskinen stopper opp.\n"
 "Ønsker du å prøve?"
 
-#: ../Xconfigurator.pm_.c:515
+#: ../Xconfigurator.pm_.c:511
 msgid ""
 "No valid modes found\n"
 "Try with another video card or monitor"
@@ -151,88 +151,88 @@ msgstr ""
 "Ingen gyldige modus funnet\n"
 "Prøv med et annet skjermkort eller monitor"
 
-#: ../Xconfigurator.pm_.c:703
+#: ../Xconfigurator.pm_.c:699
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-oppsett: %s\n"
 
-#: ../Xconfigurator.pm_.c:704
+#: ../Xconfigurator.pm_.c:700
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type mus: %s\n"
 
-#: ../Xconfigurator.pm_.c:705
+#: ../Xconfigurator.pm_.c:701
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Enhet mus: %s\n"
 
-#: ../Xconfigurator.pm_.c:706
+#: ../Xconfigurator.pm_.c:702
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../Xconfigurator.pm_.c:707
+#: ../Xconfigurator.pm_.c:703
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../Xconfigurator.pm_.c:708
+#: ../Xconfigurator.pm_.c:704
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../Xconfigurator.pm_.c:709
+#: ../Xconfigurator.pm_.c:705
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikk-kort: %s\n"
 
-#: ../Xconfigurator.pm_.c:710
+#: ../Xconfigurator.pm_.c:706
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Minne grafikk: %s kB\n"
 
-#: ../Xconfigurator.pm_.c:711
+#: ../Xconfigurator.pm_.c:707
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../Xconfigurator.pm_.c:736
+#: ../Xconfigurator.pm_.c:732
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../Xconfigurator.pm_.c:737
+#: ../Xconfigurator.pm_.c:733
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../Xconfigurator.pm_.c:738
+#: ../Xconfigurator.pm_.c:734
 msgid "Change Resolution"
 msgstr "Endre oppløsning"
 
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:735
 msgid "Automatical resolutions search"
 msgstr "Automatisk oppløsningssøk"
 
-#: ../Xconfigurator.pm_.c:743
+#: ../Xconfigurator.pm_.c:739
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../Xconfigurator.pm_.c:744
+#: ../Xconfigurator.pm_.c:740
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../Xconfigurator.pm_.c:745
+#: ../Xconfigurator.pm_.c:741
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../Xconfigurator.pm_.c:748
+#: ../Xconfigurator.pm_.c:744
 msgid "What do you want to do?"
 msgstr "Hva vil du gjøre?"
 
-#: ../Xconfigurator.pm_.c:753
+#: ../Xconfigurator.pm_.c:749
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../Xconfigurator.pm_.c:754
+#: ../Xconfigurator.pm_.c:750
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -492,7 +492,7 @@ msgid "all data on this partition will be lost"
 msgstr "alle data på denne partisjonen vil gå tapt"
 
 # #: ../install_steps_interactive.pm_.c:37
-#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:177 ../install_steps.pm_.c:71
+#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:172 ../install_steps.pm_.c:71
 #: ../install_steps_interactive.pm_.c:41
 msgid "Error"
 msgstr "Feil"
@@ -784,11 +784,11 @@ msgstr ""
 msgid "chunk size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:658
+#: ../diskdrake.pm_.c:653
 msgid "Choose an existent RAID to add to"
 msgstr ""
 
-#: ../diskdrake.pm_.c:659
+#: ../diskdrake.pm_.c:654
 msgid "new"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgstr ""
 
 # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
 #: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:399
-#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:67
+#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:68
 msgid "Help"
 msgstr "Hjelp"
 
@@ -1396,113 +1396,113 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../install2.pm_.c:40
+#: ../install2.pm_.c:41
 msgid "Choose your language"
 msgstr "Velg språk"
 
-#: ../install2.pm_.c:41
+#: ../install2.pm_.c:42
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
-#: ../install2.pm_.c:42
+#: ../install2.pm_.c:43
 msgid "Setup SCSI"
 msgstr "Oppsett SCSI"
 
-#: ../install2.pm_.c:43
+#: ../install2.pm_.c:44
 msgid "Choose install or upgrade"
 msgstr "Velg installering eller oppgradering"
 
-#: ../install2.pm_.c:44
+#: ../install2.pm_.c:45
 msgid "Configure mouse"
 msgstr "Konfigurer mus"
 
-#: ../install2.pm_.c:45
+#: ../install2.pm_.c:46
 msgid "Choose your keyboard"
 msgstr "Velg tastatur"
 
-#: ../install2.pm_.c:46
+#: ../install2.pm_.c:47
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
 
-#: ../install2.pm_.c:47
+#: ../install2.pm_.c:48
 msgid "Format partitions"
 msgstr "Formater partisjoner"
 
-#: ../install2.pm_.c:48
+#: ../install2.pm_.c:49
 msgid "Choose packages to install"
 msgstr "Velg pakker for installering"
 
-#: ../install2.pm_.c:49
+#: ../install2.pm_.c:50
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../install2.pm_.c:50
+#: ../install2.pm_.c:51
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../install2.pm_.c:51
+#: ../install2.pm_.c:52
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../install2.pm_.c:52
+#: ../install2.pm_.c:53
 msgid "Configure timezone"
 msgstr "Konfigurer tidssone"
 
-#: ../install2.pm_.c:54
+#: ../install2.pm_.c:55
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:586
+#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:586
 #: ../install_steps_interactive.pm_.c:587
 msgid "Set root password"
 msgstr "Sett root-passord"
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:57
 msgid "Add a user"
 msgstr "Legg til en bruker"
 
-#: ../install2.pm_.c:57
+#: ../install2.pm_.c:58
 msgid "Create a bootdisk"
 msgstr "Opprett en oppstartdiskett"
 
-#: ../install2.pm_.c:58
+#: ../install2.pm_.c:59
 msgid "Install bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../install2.pm_.c:59
+#: ../install2.pm_.c:60
 msgid "Configure X"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:60
+#: ../install2.pm_.c:61
 msgid "Exit install"
 msgstr "Gå ut av installering"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "beginner"
 msgstr "nybegynner"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "developer"
 msgstr "utvikler"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "expert"
 msgstr "ekspert"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:85
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:306
+#: ../install2.pm_.c:307
 msgid "Partitioning failed: no root filesystem"
 msgstr "Partisjonering feilet: intet root-filsystem"
 
-#: ../install2.pm_.c:316
+#: ../install2.pm_.c:317
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Ikke nok vekslingsplass til å fullføre installasjonen, du må legge til mer"
 
-#: ../install_any.pm_.c:178
+#: ../install_any.pm_.c:173
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -1510,7 +1510,7 @@ msgstr ""
 "Jeg kan ikke lese partisjonstabellen din, den er for ødelagt for meg :(\n"
 "Jeg vil førsøke å blanke ut dårlige partisjoner"
 
-#: ../install_any.pm_.c:194
+#: ../install_any.pm_.c:189
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -1518,28 +1518,28 @@ msgstr ""
 "DiskDrake klarte ikke å lese partisjonstabellen korrekt.\n"
 "Fortsett på egen risiko!"
 
-#: ../install_any.pm_.c:233
+#: ../install_any.pm_.c:228
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../install_any.pm_.c:234
+#: ../install_any.pm_.c:229
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen."
 
-#: ../install_any.pm_.c:236
+#: ../install_any.pm_.c:231
 msgid "No root partition found"
 msgstr "Ingen root-partisjon funnet"
 
-#: ../install_any.pm_.c:272
+#: ../install_any.pm_.c:267
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan ikke bruke broadcast uten NIS domene"
 
-#: ../install_any.pm_.c:420
+#: ../install_any.pm_.c:415
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../install_any.pm_.c:425
+#: ../install_any.pm_.c:420
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr "Dårlig kickstart-fil %s (mislykket %s)"
@@ -3053,11 +3053,11 @@ msgstr "NetWare"
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../raid.pm_.c:92
+#: ../raid.pm_.c:104
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../raid.pm_.c:127
+#: ../raid.pm_.c:139
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""