From 8e06966029625c6ae1b3a42b7261d579f27f30c3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 20 Aug 2008 08:43:17 +0000
Subject: - allow passing suppl=0 to disable "additional installation media"
 question

---
 perl-install/install/NEWS        | 1 +
 perl-install/install/install2.pm | 2 +-
 perl-install/install/media.pm    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c65f60fef..e73cfdaac 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- allow passing suppl=0 to disable "additional installation media" question
 - drakx-in-chroot:
   o fix using remote repositories
 - set title for advanced dialogs
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index dc59f62f5..6cc1c6e3d 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -370,7 +370,7 @@ sub main {
 	    rpm_dbapi => sub { $o->{rpm_dbapi} = $v },
 	    nomouseprobe => sub { $o->{nomouseprobe} = $v },
 	    updatemodules => sub { $o->{updatemodules} = 1 },
-	    suppl => sub { $o->{supplmedia} = 1 },
+	    suppl => sub { $o->{supplmedia} = $v },
 	    askmedia => sub { $o->{askmedia} = 1 },
 	    restore => sub { $::isRestore = 1 },
 	}}{lc $n}; &$f if $f;
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 09837c3b1..d8f32a5de 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -647,7 +647,7 @@ sub get_media_cfg {
         }
     }
 
-    my $suppl_CDs = $distribconf->{suppl} || $o->{supplmedia} || 0;
+    my $suppl_CDs = exists $o->{supplmedia} ? $o->{supplmedia} : $distribconf->{suppl} || 0;
     my $deselectionAllowed = $distribconf->{askmedia} || $o->{askmedia} || 0;
 
     associate_phys_media($o->{all_hds}, $phys_medium, $hdlists);
-- 
cgit v1.2.1