Sophie

Sophie

distrib > Mandriva > 2010.0 > i586 > media > contrib-release-src > by-pkgid > 91c35f0b05ec444e036cde3021962a55 > files > 7

drakx-installer-stage2-tmb-12.71-1mdv2010.0.src.rpm

diff -Nurp drakx-installer-stage2-12.54.orig4/perl-install/install/install2.pm drakx-installer-stage2-12.54/perl-install/install/install2.pm
--- drakx-installer-stage2-12.54.orig4/perl-install/install/install2.pm	2009-04-08 14:54:23.000000000 +0300
+++ drakx-installer-stage2-12.54/perl-install/install/install2.pm	2009-09-30 18:41:13.363564448 +0300
@@ -343,6 +343,7 @@ sub main {
 	    step      => sub { $o->{steps}{first} = $v },
 	    meta_class => sub { $o->{meta_class} = $v },
 	    freedriver => sub { $o->{freedriver} = $v },
+	    no32bit   => sub { $o->{no32bit} = 1 },
 	    no_bad_drives => sub { $o->{partitioning}{no_bad_drives} = 1 },
 	    nodmraid  => sub { $o->{partitioning}{nodmraid} = 1 },
 	    debug_urpmi  => sub { $o->{debug_urpmi} = 1 },
diff -Nurp drakx-installer-stage2-12.54.orig4/perl-install/install/media.pm drakx-installer-stage2-12.54/perl-install/install/media.pm
--- drakx-installer-stage2-12.54.orig4/perl-install/install/media.pm	2009-04-23 14:55:15.000000000 +0300
+++ drakx-installer-stage2-12.54/perl-install/install/media.pm	2009-09-30 21:09:01.866812836 +0300
@@ -459,14 +459,16 @@ sub _parse_media_cfg {
     my $distribconf = { map { $_ => $d->getvalue(undef, $_) } 'suppl', 'askmedia' };
     my @hdlists = map { 
 	my ($size) = $d->getvalue($_, 'size') =~ /(\d+)MB?/i;
-	my $name = $d->getvalue($_, 'name'); 
+	my $arch = $d->getvalue($_, 'arch');
+	my $name = $d->getvalue($_, 'name');
+	my $selected = $d->getvalue($_, 'noauto') ? 1 : ($no32bit && ($arch eq 'i586')) ? 1 : undef;
 	$name =~ s/^"(.*)"$/$1/;
 	{ 
 	    rpmsdir => $_,
 	    rel_hdlist => 'media_info/' . $d->getvalue($_, 'hdlist'),
 	    name => $name,
 	    size => $size,
-	    selected => !$d->getvalue($_, 'noauto'),
+	    selected => !$selected,
 	    update => $d->getvalue($_, 'updates_for') ? 1 : undef,
 	};
     } $d->listmedia;