no_comment

9 files changed, 39 insertions, 13 deletions

diff --git a/docs/TODO b/docs/TODO
index ce25b48aa..a7b031ff7 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,6 +1,8 @@
-(pix)install text on mem=8M, mem=16M?
+ask supermount or not, no supermount with kernel-secure
+
+(pix)add paride.o (and the others)
 
-change the boot message of syslinux (have something different from RedHat)
+(pix)install text on mem=8M, mem=16M?
 
 (fpons)bug: CANON BJC 4X00 do not work with current rhs-printfilters
   (work with magicfilters (debian))
@@ -134,3 +136,6 @@ suggested partition tables must be better foreach installClass
 (done,pix) move security question before isntallation of packages
 
 (done,pix) install ssh
+
+(done,fpons,pix) change the boot message of syslinux (have something different from RedHat)
+
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d714d08e7..635aae38f 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -595,8 +595,13 @@ sub main {
 
 	last if $o->{step} eq 'exitInstall';
     }
-    substInFile { s|/sbin/mingetty tty1.*|/bin/bash --login| } "$o->{prefix}/etc/inittab" if $o->{security} < 1;    
+    substInFile { s|/sbin/mingetty tty1.*|/bin/bash --login| } "$o->{prefix}/etc/inittab" if $o->{security} < 1;
+
+    output("$o->{prefix}/tmp/secure.DrakX",
+	   "DRAKX_PASSWORD=$o->{lilo}{password}\n",
+	   'DRAKX_USERS="', join(" ", map { $_->{name} } @{$o->{users} || []}), qq("\n));
     run_program::rooted($o->{prefix}, "/etc/security/msec/init.sh", $o->{security});
+#    unlink "$o->{prefix}/tmp/secure.DrakX";
 
     fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab});
     modules::write_conf("$o->{prefix}/etc/conf.modules", 'append');
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7e176fbbe..09a602a7c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -405,7 +405,10 @@ sub g_auto_install(;$) {
 
     if (my $card = $::o->{X}{card}) {
 	$o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
-	$o->{X}{card}{resolution_wanted} ||= join "x", @{$card->{depth}{$card->{default_depth}}[0]} if $card->{depth};
+	if ($card->{default_depth} and my $depth = $card->{depth}{$card->{default_depth}}) {
+	    $depth ||= [];
+	    $o->{X}{card}{resolution_wanted} ||= join "x", @{$depth->[0]} unless is_empty_array_ref($depth->[0]);
+	}
     }
 
 #-    local $o->{partitioning}{clearall} = 1;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 8414c897a..53f95c72c 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -266,8 +266,9 @@ sub choosePackages {
 
     if ($::beginner) {	
 	require pkgs;
-	pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, install_any::getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang}, $o->{isUpgrade});
+	pkgs::setSelectedFromCompssList_($o->{compssListLevels}, $o->{packages}, install_any::getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang}, $o->{isUpgrade});
     } else {
+	pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 90, $o->{installClass}) unless $::expert || $o->{isUpgrade};
 	install_steps_interactive::choosePackages(@_);
 	chooseSizeToInstall(@_);
 	choosePackagesTree(@_) if $::expert;
@@ -278,7 +279,7 @@ sub chooseSizeToInstall {
     my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024));
     my $current = pkgs::correctSize((sum map { $_->{size} } grep { $_->{selected} } values %$packages) / sqr(1024));
     my $w = my_gtk->new('');
-    my $adj = create_adjustment($current * 1.3, $current, $availableSpace);
+    my $adj = create_adjustment($current * 1.2, $current, $availableSpace);
     my $spin = gtkset_usize(new Gtk::SpinButton($adj, 0, 0), 100, 0);
 
     gtkadd($w->{window},
@@ -297,9 +298,9 @@ sub chooseSizeToInstall {
     $w->main or return;
 
     ($o->{packages_}{ind}, $o->{packages_}{select_level}) = 
-      pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 
-				      pkgs::invCorrectSize($spin->get_value_as_int) * sqr(1024), 
-				      $o->{installClass}, $o->{lang}, $o->{isUpgrade});
+      pkgs::setSelectedFromCompssList_($o->{compssListLevels}, $o->{packages}, 
+				       pkgs::invCorrectSize($spin->get_value_as_int) * sqr(1024), 
+				       $o->{installClass}, $o->{lang}, $o->{isUpgrade});
 }
 sub choosePackagesTree {
     my ($o, $packages, $compss, $compssUsers) = @_;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8d4cab630..02d9349a1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -599,7 +599,7 @@ _("Linear (needed for some SCSI drives)") => { val => \$b->{linear}, type => "bo
 _("Compact") => { val => \$b->{compact}, type => "bool", text => _("compact") },
 _("Delay before booting default image") => \$b->{timeout},
 _("Video mode") => { val => \$b->{vga}, list => [ keys %lilo::vga_modes ], not_edit => $::beginner },
-$o->{security} >= 4 ? () : (
+$o->{security} < 4 ? () : (
 _("Password") => { val => \$b->{password}, hidden => 1 },
 _("Restrict command line options") => { val => \$b->{restricted}, type => "bool", text => _("restrict") },
 )
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 435691fac..27054b8db 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -183,7 +183,6 @@ sub write {
 
 sub load_po($) {
     my ($lang) = @_;
-#-  my @lang = split ':', $lang;
     my ($s, $from, $to, $state, $fuzzy);
 
 
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 9f4ad341d..21ad27582 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -23,6 +23,7 @@ my @MBR_signatures = (
     [ 'DocsBoot', 0x148, 'DocsBoot' ],
     [ 'system_commander', 0x1ad, "SYSCMNDRSYS" ],
     [ 'Be Os', 0x24, 'Boot Manager' ],
+    [ 'TimO', 0, 'IBM Thinkpad hibernation partition' ],
     [ 'os2', 0x1c2, "\xA" ],
     [ 'dos', 0xa0, "\x25\x03\x4E\x02\xCD\x13" ],
     [ 'dos', 0x60, "\xBB\x00\x7C\xB8\x01\x02\x57\xCD\x13\x5F\x73\x0C\x33\xC0\xCD\x13" ], #- nt's
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index b85be3b35..01d744038 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -275,12 +275,23 @@ sub isLangSensitive($$) {
 }
 
 sub setSelectedFromCompssList($$$$$$) {
-    my ($compssListLevels, $packages, $size, $install_class, $lang, $isUpgrade) = @_;
+    my ($compssListLevels, $packages, $level, $install_class) = @_;
+    my ($ind);
+
+    map_index { $ind = $::i if $_ eq $install_class } @$compssListLevels;
+
+    foreach (allpackages($packages)) {
+	&select($packages, $_) if $_->{values}[$ind] >= $level;
+    }
+}
+
+sub setSelectedFromCompssList_($$$$$$) {
+    my ($compssListLevels, $packages, $size, $install_class, $isUpgrade) = @_;
     my ($level, $ind) = 100;
 
     my @packages = allpackages($packages);
     my @places = do {
-	map_index { $ind = $::i if $_ eq $install_class } @{$compssListLevels};
+	map_index { $ind = $::i if $_ eq $install_class } @$compssListLevels;
 	defined $ind or log::l("unknown install class $install_class in compssList"), return;
 
 	my @values = map { $_->{values}[$ind] } @packages;
diff --git a/perl-install/resize_fat/main.pm b/perl-install/resize_fat/main.pm
index ade04122c..a67dbd26f 100644
--- a/perl-install/resize_fat/main.pm
+++ b/perl-install/resize_fat/main.pm
@@ -164,6 +164,7 @@ sub resize {
     $resize_fat::isFAT32 and eval { resize_fat::info_sector::write($fs) }; #- doesn't matter if this fails - its pretty useless!
 
     sync();
+    close $fs->{fd};
     log::l("resize_fat: done");
 }