From 4aa2ecefeca3b9b7580dc73106920b9c814efa6d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 11 May 2000 15:15:45 +0000
Subject: no_comment

---
 perl-install/install_steps_gtk.pm         | 2 +-
 perl-install/install_steps_interactive.pm | 2 +-
 perl-install/pkgs.pm                      | 4 ++--
 rescue/list                               | 4 +---
 rescue/make_rescue_img                    | 4 ++++
 rescue/tree/etc/issue                     | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index b2f6f4a57..2169b8bb4 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -439,7 +439,7 @@ sub choosePackagesTree {
 	pkgs::extractHeaders($o->{prefix}, [$p], $p->{medium});
 	$p->{header} or die;
 
-	my $ind = $o->{compssListLevels}{$o->{install_class}};
+	my $ind = $o->{compssListLevels}{$o->{installClass}};
 	my $imp = translate($pkgs::compssListDesc{pkgs::packageFlagBase($p) ? 100 : round_down($p->{values}[$ind], 10)});
 
 	gtktext_insert($info_widget, $@ ? _("Bad package") :
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a21f57d68..9beebdc99 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -740,7 +740,7 @@ sub addUser {
 sub createBootdisk {
     my ($o, $first_time) = @_;
 
-    return if $first_time && $::beginner;
+    return if $first_time && $::beginner || $o->{lnx4win};
 
     my @l = detect_devices::floppies();
     my %l = (
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 49414b4b1..46c52c229 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -27,8 +27,8 @@ use c;
   40 => __("interesting"),
   30 => __("maybe"),
   20 => __("maybe"),
-  10 => __("useless"),
-   0 => __("garbage"),
+  10 => __("maybe"),#__("useless"),
+   0 => __("maybe"),#__("garbage"),
 #- if the package requires locales-LANG and LANG is chosen, rating += 90
  -10 => __("i18n (important)"), #- every install in the corresponding lang have these packages
  -20 => __("i18n (very nice)"), #- every beginner/custom install in the corresponding lang have theses packages
diff --git a/rescue/list b/rescue/list
index 03e3f5714..e1bd0441c 100644
--- a/rescue/list
+++ b/rescue/list
@@ -53,6 +53,7 @@
 /dev/port
 /dev/ram*
 /dev/random
+/dev/sd[a-h]*
 /dev/stderr
 /dev/stdin
 /dev/stdout
@@ -63,9 +64,6 @@
 /dev/zero
 /etc/inputrc
 /etc/termcap
-/mnt/cdrom
-/mnt/disk
-/mnt/floppy
 /sbin/debugfs
 /sbin/e2fsck
 /sbin/fdisk
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 2e3178ca7..56309dfe5 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -51,6 +51,10 @@ foreach (cat_("list")) {
     install($_);
     chomp, install_lib($_) foreach `ldd $_ 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//'`;
 }
+foreach (cat_("dirs")) {
+    chomp;
+    commands::mkdir_("-p", "$tmp$_");
+}
 foreach (cat_("aliases")) {
     chomp; my ($f, $dest) = split;
     symlink $dest, "$tmp$f";
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index 8c579e127..b7c23b234 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -18,7 +18,7 @@
                       
 
 
-Linux Mandrake release 7.0 (Air)
+Linux Mandrake release 7.1 (Helium)
 
 Use loadkeys to change your keyboard layout (eg: loadkeys fr)
 Use modprobe to load modules
-- 
cgit v1.2.1