diff options
| -rw-r--r-- | docs/TODO | 2 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 3 | ||||
| -rw-r--r-- | perl-install/any.pm | 3 | ||||
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/help.pm | 9 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/interactive_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/raid.pm | 2 | ||||
| -rw-r--r-- | rescue/list | 6 |
10 files changed, 24 insertions, 9 deletions
@@ -25,6 +25,8 @@ PPPoE install and configuration (SuSE includes it, DHCP-like) (7.1)standalone applications for configuration (netdrake, timetool, authentificationconf, soundcard) ---- +(7.2) replace normal with standard (in the installClass's) + (7.2 or later)horizontal sub-steps (7.2 or later)diskdrake in text mode diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 4e1c2c866..10beedee5 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,8 @@ 2000-05-02 Pixel <pixel@mandrakesoft.com> + * raid.pm (format_part): don't call raid::make if part is already + formatted (as raidstop fails) + * Xconfigurator_consts.pm: Rage128 and 3dfx are not available any more diff --git a/perl-install/any.pm b/perl-install/any.pm index bd7098285..61ad2d7ec 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -75,6 +75,9 @@ sub setupBootloader { #- at least one method grep_each { $::b } %{$b->{methods}} or return; + #- put lilo if grub is chosen, so that /etc/lilo.conf is generated + exists $b->{methods}{lilo} and $b->{methods}{lilo} = 1 if $b->{methods}{grub}; + my @l = ( _("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } @$hds, @$fstab), detect_devices::floppies() ], not_edit => !$::expert }, _("LBA (doesn't work on old BIOSes)") => { val => \$b->{lba32}, type => "bool", text => "lba" }, diff --git a/perl-install/fs.pm b/perl-install/fs.pm index b4812c360..c787561a8 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -161,7 +161,7 @@ sub formatMount_part { sub formatMount_all { my ($raid, $fstab, $prefix, $callback) = @_; formatMount_part($_, $raid, $fstab, $prefix, $callback) - foreach sort { isLoopback($a) ? 1 : -1 } grep { $_->{mntpoint} } @$fstab; + foreach sort { isLoopback($a) ? 1 : isSwap($a) ? -1 : 0 } grep { $_->{mntpoint} } @$fstab; #- ensure the link is there loopback::carryRootCreateSymlink($_, $prefix) foreach @$fstab; diff --git a/perl-install/help.pm b/perl-install/help.pm index 13c80d418..da4c49b41 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -9,17 +9,16 @@ __("Choose preferred language for install and system usage."), selectKeyboard => __("Choose the layout corresponding to your keyboard from the list above"), -selectPath => +selectInstallClass => __("Choose \"Install\" if there are no previous versions of Linux installed, or if you wish to use multiple distributions or versions. - Choose \"Upgrade\" if you wish to update a previous version of Mandrake Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold 2000 -or 7.0 (Air)."), +or 7.0 (Air). -selectInstallClass => - __("Select: + +Select: - Recommended: If you have never installed Linux before, choose this. NOTE: networking will not be configured during installation, use \"LinuxConf\" diff --git a/perl-install/install2.pm b/perl-install/install2.pm index c4ba511b4..074674bff 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -477,7 +477,7 @@ sub configureX { fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount}); modules::write_conf("$o->{prefix}/etc/conf.modules"); - $o->setupXfree if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) || $clicked; + $o->setupXfree;# if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) || $clicked; } #------------------------------------------------------------------------------ sub generateAutoInstFloppy { diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index 66a714221..98beacdc7 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -87,7 +87,7 @@ sub ask_from_treelistW { }; my ($root, $leaf, $wdef, $ndef); foreach (@$l) { - ($root, $leaf) = /(.*)$sep(.+)/o or ($root, $leaf) = ('', $_); + ($root, $leaf) = /(.*)$sep(.+)/ or ($root, $leaf) = ('', $_); my $node = $tree->insert_node($parent->($root), undef, [$leaf], 5, (undef) x 4, 1, 0); if ($def eq $_) { diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 198df945a..b592f140a 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -629,7 +629,7 @@ sub setSelectedFromCompssList { } if ($max_size && $nb > $max_size) { $min_level = $p->{values}[$ind]; - log::l("setSelectedFromCompssList: up to indice $min_level (reached size $max_size)"); + log::l("setSelectedFromCompssList: up to indice $min_level (reached size $nb)"); last; } diff --git a/perl-install/raid.pm b/perl-install/raid.pm index e5605c5bf..585f2565e 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -133,6 +133,8 @@ sub make { sub format_part($$) { my ($raid, $part) = @_; + $part->{isFormatted} and return; + make($raid->{raid}, $part); fs::real_format_part($part); $_->{isFormatted} = 1 foreach @{$part->{disks}}; diff --git a/rescue/list b/rescue/list index ce9de846a..8f7c1f2bd 100644 --- a/rescue/list +++ b/rescue/list @@ -105,6 +105,7 @@ /usr/bin/telnet /usr/bin/telnet /usr/bin/tset +/usr/sbin/chroot /usr/sbin/traceroute /usr/share/magic /usr/share/terminfo/l/linux @@ -120,3 +121,8 @@ /sbin/lspci /usr/share/pci.ids /bin/rpm +/sbin/mkreiserfs +/sbin/mkraid +/usr/sbin/rescuept +/usr/lib/rpm/rpmrc +/usr/sbin/ext2resize |