no_comment

10 files changed, 18 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index b02bc4501..c4937d314 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ upload: tar install
 	touch /tmp/mdkinst_done
 	cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
 
-	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/gi_*.img"
+#	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/cooker/images ; mput $(ROOTDEST)/images/gi_*.img"
 	lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd ~/cooker/cooker/Mandrake/base ; put $(ROOTDEST)/Mandrake/base/mdkinst_stage2.gz ; put ~/gi/perl-install/compss ; put ~/gi/perl-install/compssList ; put ~/gi/perl-install/compssUsers ; cd ~/cooker/cooker/misc ; put ~/gi/tools/make_mdkinst_stage2 "
-	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
+#	lftp -c "open -u devel mandrakesoft.com; cd ~/cooker/contrib/others/src ; put ~/gi.tar.bz2"
 	rm -f $(ROOTDEST)/Mandrake/mdkinst.tgz
 	rm -f /tmp/mdkinst_done
 
diff --git a/perl-install/Makefile b/perl-install/Makefile
index f0dc744d9..1b9f28c49 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -9,7 +9,7 @@ STAGE2      = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
 BASE        = $(ROOTDEST)/Mandrake/base
 DESTREP4PMS = $(DEST)$(REP4PMS)
 PERL        = perl
-LOCALFILES  = pnp_serial
+LOCALFILES  = ../tools/ddcprobe/ddcxinfos pnp_serial
 LOCALFILES2 = extract_archive
 DIRS        = c Newt po pci_probing resize_fat
 EXCLUDE     = $(LOCALFILES) boot.img keymaps consolefonts install
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 1bf3293a1..87eb0c132 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -226,7 +226,7 @@ sub write_fstab($;$$) {
     unshift @to_add,
       map {
 	  my ($dir, $options, $freq, $passno) = qw(/dev/ defaults 0 0);
-	  $options ||= $_->{options};
+	  $options = $_->{options} || $options;
 
 	  isExt2($_) and ($freq, $passno) = (1, ($_->{mntpoint} eq '/') ? 1 : 2);
 	  isNfs($_) and $dir = '', $options ||= 'ro,rsize=8192,wsize=8192';
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index ebae53669..1bca50f5c 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -140,7 +140,6 @@ sub suggest_part($$$;$) {
     $part->{mntpoint} = $best->{mntpoint};
     $part->{type} = $best->{type};
     $part->{size} = computeSize($part, $best, $hds, $suggestions);
-    print "<<<<$part->{size}, $part->{maxsize}\n";
     1;
 }
 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 1f2d8f1b1..980277321 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -138,9 +138,10 @@ $o = $::o = {
 #-		   { mntpoint => "/usr",  size => 400 << 11, type => 0x83, growable => 1 },
 #-	     ],
     shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ],
-    authentification => { md5 => 1, shadow => 1 },
+    authentication => { md5 => 1, shadow => 1 },
     lang         => 'en',
     isUpgrade    => 0,
+#-    simple_themes => 1,
 #-    installClass => "normal",
 
     timezone => {
@@ -520,7 +521,6 @@ sub main {
 
     #-  make sure we don't pick up any gunk from the outside world
     $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin" unless $::g_auto_install;
-    $ENV{LD_LIBRARY_PATH} = "";
 
     if ($o->{interactive} eq "gtk" && availableMemory < 24 * 1024) {
 	log::l("switching to newt install cuz not enough memory");
@@ -545,10 +545,6 @@ sub main {
     $o->{prefix} = $::testing ? "/tmp/test-perl-install" : "/mnt";
     mkdir $o->{prefix}, 0755;
 
-    #-  make sure we don't pick up any gunk from the outside world
-    $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin";
-    $ENV{LD_LIBRARY_PATH} = "";
-
     #- needed very early for install_steps_gtk
     eval { $o->{mouse} ||= mouse::detect() };
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2e8effdf4..9086ac435 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -260,7 +260,7 @@ sub write_ldsoconf {
 }
 
 sub setAuthentication() {
-    my ($shadow, $md5, $nis, $nis_server) = @{$::o->{authentification} || {}}{qw(shadow md5 NIS NIS_server)};
+    my ($shadow, $md5, $nis, $nis_server) = @{$::o->{authentication} || {}}{qw(shadow md5 NIS NIS_server)};
     my $p = $::o->{prefix};
     enableMD5Shadow($p, $shadow, $md5);
     enableShadow() if $shadow;
@@ -309,7 +309,7 @@ sub enableMD5Shadow($$$) {
 sub crypt($) {
     my ($password) = @_;
 
-    $::o->{authentification}{md5} ?
+    $::o->{authentication}{md5} ?
       c::crypt_md5($password, salt(8)) :
          crypt    ($password, salt(2));
 }
@@ -388,7 +388,7 @@ sub g_auto_install(;$) {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentification printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade X manualFstab); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade X manualFstab); #- TODO modules bootloader 
 
 #-    local $o->{partitioning}{clearall} = 1;
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f01463aff..822b38493 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -616,10 +616,10 @@ sub setRootPassword($) {
 _("Password") => { val => \$sup->{password},  hidden => 1 },
 _("Password (again)") => { val => \$sup->{password2}, hidden => 1 },
   $o->{installClass} eq "server" || $::expert ? (
-_("Use shadow file") => { val => \$o->{authentification}{shadow}, type => 'bool', text => _("shadow") },
-_("Use MD5 passwords") => { val => \$o->{authentification}{md5}, type => 'bool', text => _("MD5") },
+_("Use shadow file") => { val => \$o->{authentication}{shadow}, type => 'bool', text => _("shadow") },
+_("Use MD5 passwords") => { val => \$o->{authentication}{md5}, type => 'bool', text => _("MD5") },
   ) : (), $::beginner ? () : (
-_("Use NIS") => { val => \$o->{authentification}{NIS}, type => 'bool', text => _("yellow pages") },
+_("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("yellow pages") },
   )
 			 ], 
 			 complete => sub {
@@ -630,12 +630,12 @@ _("Use NIS") => { val => \$o->{authentification}{NIS}, type => 'bool', text => _
 			 }
     ) or return;
 
-    if ($o->{authentification}{NIS}) {
+    if ($o->{authentication}{NIS}) {
 	$o->ask_from_entries_ref('',
 				 _("Authentification NIS"),
 				 [ _("NIS Domain"), _("NIS Server") ],
 				 [ \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}),
-				   { val => \$o->{authentification}{NIS_server}, list => ["broadcast"] },
+				   { val => \$o->{authentication}{NIS_server}, list => ["broadcast"] },
 				 ]);
     }
     install_steps::setRootPassword($o);
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index d31041a32..1e1827a25 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -11,6 +11,7 @@ use modules;
 use pci_probing::main;
 use detect_devices;
 use run_program;
+use devices;
 use commands;
 use modules;
 use log;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index f25357a49..c4e41db87 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -51,10 +51,9 @@ sub select($$;$) {
 	my %l; @l{@{$p->{deps} || die "missing deps file"}} = ();
 	while (do { my %l = %l; while (($n, $v) = each %l) { last if $v != 1; } $n }) {
 	    $l{$n} = 1;
-	    my $i = Package($packages, $n);
+	    my $i = $packages->{$n};
 	    if (!$i && $n =~ /\|/) {
 		foreach (split '\|', $n) {
-		    print "SSSSSSSSSSSSS $_\n";
 		    $i = Package($packages, $_);
 		    last if $i && $i->{selected};
 		}
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index ecb55123d..70f4316d9 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -22,6 +22,7 @@ aumix                                         15     0     2
 authconfig                                    90    99    90
 autoconf                                       5     0    94
 autofs                                        22     0    50
+autoirpm-icons                                85     0    70
 automake                                       5     0    94
 awesfx                                        15     0    13
 bash1                                         15     0    13
@@ -469,7 +470,7 @@ pam                                            7    99    91
 patch                                         32     0    72
 pciutils                                      16     0    14
 pdksh                                         10     0     9
-perl                                           0    99    80
+perl                                           0    99    90
 perlftlib                                      1     0     0
 perl-GTK                                       1     0    72
 perl-MD5                                       1    99    75