no_comment

12 files changed, 386 insertions, 39 deletions

diff --git a/docs/COPYING b/docs/COPYING
new file mode 100644
index 000000000..60549be51
--- /dev/null
+++ b/docs/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/docs/TODO b/docs/TODO
index a774d2c6b..5683cced2 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,3 +1,8 @@
+install2 sigsegv when leaving :(
+(just do active and it will do it)
+
+xmodmaps for every languages (maybe gnome-core xmodmaps can help)
+
 Verify the free space is big enough.
 
 left window in the install (steps) should have a smaller font.
@@ -8,6 +13,9 @@ trash on the screen when X first start
 
 do not allow window resizing
 
+network configuration
+Xconfigurator
+
 get the error when reading .rpm files fail
 
 setupSCSIInterfaces
diff --git a/perl-install/Makefile b/perl-install/Makefile
index bfc8a9622..5381b1391 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -134,7 +134,7 @@ full_stage2:
 stage2:
 	$(MAKE) install_pms
 	cd $(ROOTDEST) ; tar cfz /tmp/instimage-full.tgz Mandrake
-	cd $(ROOTDEST) ; tar cfz /tmp/instimage-light.tgz Mandrake/instimage/usr/[bl]*
+	cd $(ROOTDEST) ; tar cfz /tmp/instimage-light.tgz Mandrake/base/depslist Mandrake/instimage/usr/[bl]*
 
 	@#rm -rf /mnt/initrd/*
 	@#cp -a $(DEST)/* /mnt/initrd
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 17f4b2580..9b06743fa 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -77,7 +77,7 @@ sub mkdir_ {
 	}
 	mkdir $_[0], 0755 or die "mkdir: error creating directory $_: $!\n";
     };
-    foreach (@_) { &$mkdir($_); }
+    &$mkdir($_) foreach @_;
 }
 
 
diff --git a/perl-install/common.pm b/perl-install/common.pm
index feec2e844..429a18d35 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -20,7 +20,7 @@ $SECTORSIZE = 512;
 
 1;
 
-sub _ { my $s = shift; sprintf translate($s), @_ }
+sub _ { my $s = shift @_; sprintf translate($s), @_ }
 sub __ { $_[0] }
 sub min { my $min = shift; grep { $_ < $min and $min = $_; } @_; $min }
 sub max { my $max = shift; grep { $_ > $max and $max = $_; } @_; $max }
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 024ceb5e6..0b08c0775 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -239,7 +239,5 @@ sub write_fstab($;$$) {
 	exists $new{$a} || exists $new{$b} and next;
 	print F $_;
     }
-    foreach (@to_add) {
-	print F join(" ", @$_), "\n";
-    }
+    print F join(" ", @$_), "\n" foreach @to_add;
 }
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 049331533..0ba4ae3b0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -107,7 +107,7 @@ my $default = {
 	      [ 0, __('Games') => qw(xbill xboard xboing xfishtank xgammon xjewel xpat2 xpilot xpuzzles xtrojka xkobo freeciv) ],
 	     ],
     packages => [ qw() ],
-    partitionning => { clearall => 0, eraseBadPartitions => 1, autoformat => 1 },
+    partitionning => { clearall => $::testing, eraseBadPartitions => 1, autoformat => 1 },
     partitions => [
 		   { mntpoint => "/boot", size =>  16 << 11, type => 0x83 }, 
 		   { mntpoint => "/",     size => 300 << 11, type => 0x83 }, 
@@ -282,7 +282,8 @@ sub main {
 
     for (my $step = $o->{steps}->{first}; $step ne 'done'; $step = getNextStep($step)) {
 	$o->enteringStep($step);
-	&{$install2::{$step}}() and $o->{steps}->{$step}->{completed} = 1;
+	eval { &{$install2::{$step}}() };
+	$@ and $o->warn($@);
 	$o->leavingStep($step);
     }
     killCardServices();
diff --git a/perl-install/install_steps_stdio.pm b/perl-install/install_steps_stdio.pm
index 9db9b2f9f..4c4c74c84 100644
--- a/perl-install/install_steps_stdio.pm
+++ b/perl-install/install_steps_stdio.pm
@@ -64,15 +64,13 @@ sub choosePackages($$$) {
 			       [ map { $_->{selected} } @$comps ]);
     
     for (my $i = 0; $i < @$comps; $i++) {
-	$comps[$i]->{selected} = $r[$i];
+	$comps->[$i]->{selected} = $r[$i];
     }
 }
 
 sub installPackages {
     my $o = shift;
 
-    $::testing and exit 0;
-
     my $old = \&log::ld;
     local *log::ld = sub { 
 	my $m = shift;
@@ -187,7 +185,7 @@ sub ask_many_from_list {
     foreach (@t) { check_it($_, $n) or goto TRY_AGAIN }
 
     my @rr = (0) x @$list;
-    foreach (@t) { $rr[$_ - 1] = 1; }
+    $rr[$_ - 1] = 1 foreach @t;
     @rr;
 }
 
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8ccf611ca..6f6f5976e 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -206,7 +206,7 @@ sub load($;$$) {
 
     $type or ($type, $minor) = @{$drivers{$name}}[3,4];
 
-    foreach (@{$deps{$name}}) { load($_, 'prereq', $minor) }
+    load($_, 'prereq', $minor) foreach @{$deps{$name}};
     load_raw($name, $type, $minor);
 }
 
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index c2f0166bf..b432e706b 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -33,7 +33,9 @@ sub new {
 sub main($;$) {
     my ($o, $f) = @_;
     $o->show;
+    $o->{window}->grab_add;
     do { Gtk->main } while ($o->{retval} && $f && !&$f());
+    $o->{window}->grab_remove;
     $o->destroy;
     $o->{retval}
 }
@@ -253,31 +255,33 @@ sub _ask_from_list($$$@) {
     for (my $i = 0; $i < @sorted; $i++) {
 	my $focused = $i;
 	my $w = new Gtk::ListItem($sorted[$i]);
-	$w->signal_connect(key_press_event => sub {
+	my $id = $w->signal_connect(key_press_event => sub {
              my ($w, $e)= @_;
 	     my $c = chr $e->{keyval};
-
+	
 	     Gtk->timeout_remove($timeout) if $timeout; $timeout = '';
-
+	
 	     if ($e->{keyval} >= 0x100) {
-		 if ($c eq "\r" || $c eq "\x8d") {
-		     $list->select_item($focused);
-		 }
-		 $starting_word = '';
+		   if ($c eq "\r" || $c eq "\x8d") {
+		       $list->select_item($focused);
+		   }
+		   $starting_word = '';
 	     } else {
-		 my $curr = $focused + bool($starting_word eq '' || $starting_word eq $c);
-		 $starting_word .= $c unless $starting_word eq $c;
-
-		 my $j; for ($j = 0; $j < @sorted; $j++) {
-		     $sorted[($j + $curr) % @sorted] =~ /^$starting_word/i and last;
-		 }
-		 $j == @sorted ?
-		   $starting_word = '' :
-		   $widgets[($j + $curr) % @sorted]->grab_focus;
-
-		 $timeout = Gtk->timeout_add($forgetTime, sub { $timeout = $starting_word = ''; 0 } );
+		   my $curr = $focused + bool($starting_word eq '' || $starting_word eq $c);
+		   $starting_word .= $c unless $starting_word eq $c;
+	
+		   my $j; for ($j = 0; $j < @sorted; $j++) {
+		       $sorted[($j + $curr) % @sorted] =~ /^$starting_word/i and last;
+		   }
+		   $j == @sorted ?
+		     $starting_word = '' :
+		     $widgets[($j + $curr) % @sorted]->grab_focus;
+	
+		   $w->{timeout} = $timeout = Gtk->timeout_add($forgetTime, sub { $timeout = $starting_word = ''; 0 } );
 	     }
+	     1;
 	});
+	push @::ask_from_list_widgets, $w; # hack!! to not get SIGSEGV
 	push @widgets, $w;
     }
     gtkadd($list, @widgets);
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 3f46e7ea7..0ad949a53 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -156,9 +156,7 @@ sub read_one($$) {
 
     @extended > 1 and die "more than one extended partition";
 
-    foreach (@normal, @extended) {
-	$_->{rootDevice} = $hd->{device};
-    }
+    $_->{rootDevice} = $hd->{device} foreach @normal, @extended;
     { raw => $pt, extended => $extended[0], normal => \@normal };
 }
 
@@ -236,7 +234,7 @@ sub write($) {
 sub active($$) {
     my ($hd, $part) = @_;
 
-    foreach (@{$hd->{primary}->{normal}}) { $_->{active} = 0; }
+    $_->{active} = 0 foreach @{$hd->{primary}->{normal}};
     $part->{active} = 0x80;   
 }
 
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index bb485e767..5407cd045 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -181,10 +181,10 @@ sub install {
     my ($total, $nb);
 
     foreach my $p (@$toInstall) {
-	$p->{file} ||= 
-	  install_any::imageGetFile(sprintf "%s-%s-%s.%s.rpm",
-				    map { c::headerGetEntry($p->{header}, $_) } 
-				    qw(name version release arch));
+	local *F;
+	open F, $p->{file} or die "error opening package $p->{name} (file $p->{file})";
+	$p->{header} = c::rpmReadPackageHeader(fileno F);
+
 	c::rpmtransAddPackage($trans, $p->{header}, $p->{file}, $isUpgrade);
 	$nb++;
 	$total += $p->{size};