summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-16 11:45:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-16 11:45:15 +0000
commitb4e4f9467faefaaec68d0272f6fa776985810473 (patch)
tree7e6f33c9afb255905eea11e9aee4a8595660908e
parentdcb0bc32da08ac9b41a027e2c55cd2911ac6d7fc (diff)
downloaddrakx-b4e4f9467faefaaec68d0272f6fa776985810473.tar
drakx-b4e4f9467faefaaec68d0272f6fa776985810473.tar.gz
drakx-b4e4f9467faefaaec68d0272f6fa776985810473.tar.bz2
drakx-b4e4f9467faefaaec68d0272f6fa776985810473.tar.xz
drakx-b4e4f9467faefaaec68d0272f6fa776985810473.zip
Allow to specify "suppl" and "askmedia" in the kernel command-line as well as in the hdlists file
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/pkgs.pm2
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index bd3d92b18..49f6b6b10 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -361,7 +361,7 @@ sub main {
my ($cfg, $patch, @auto);
my %cmdline = map {
- my ($n, $v) = split '=';
+ my ($n, $v) = split /=/;
$n => $v || 1;
} split ' ', cat_("/proc/cmdline");
@@ -417,6 +417,8 @@ sub main {
updatemodules => sub { $o->{updatemodules} = 1 },
move => sub { $::move = 1 },
globetrotter => sub { $::move = 1; $::globetrotter = 1 },
+ suppl => sub { $o->{supplmedia} = 1 },
+ askmedia => sub { $o->{askmedia} = 1 },
}}{lc $n}; &$f if $f;
} %cmdline;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index aa9e54d11..4f2a983e5 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -396,7 +396,7 @@ sub psUsingHdlists {
my $is_ftp = $o_hdlistsprefix =~ /^ftp:/;
my $listf = install_any::getFile($o_hdlistsprefix && !$is_ftp ? "$o_hdlistsprefix/media/media_info/hdlists" : 'media/media_info/hdlists')
or die "no hdlists found";
- my ($suppl_CDs, $deselectionAllowed) = (0, 0);
+ my ($suppl_CDs, $deselectionAllowed) = ($o->{supplmedia} || 0, $o->{askmedia} || 0);
if (!$o_packages) {
$o_packages = new URPM;
#- add additional fields used by DrakX.