summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-25 06:37:02 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-25 17:07:50 +0200
commit7e0107e0e8f070f90d2b1f48e0c25350cd19e627 (patch)
treeff5bd955be058f1596499f5f52f2ccd360fbfd0e
parent450d6db52805491c2c19d5eb37f0c9e7f2377c3b (diff)
downloaddrakx-7e0107e0e8f070f90d2b1f48e0c25350cd19e627.tar
drakx-7e0107e0e8f070f90d2b1f48e0c25350cd19e627.tar.gz
drakx-7e0107e0e8f070f90d2b1f48e0c25350cd19e627.tar.bz2
drakx-7e0107e0e8f070f90d2b1f48e0c25350cd19e627.tar.xz
drakx-7e0107e0e8f070f90d2b1f48e0c25350cd19e627.zip
do not offer to add a CD-ROM as supplement media
rationale (mga#13671): we don't have multi-CD install for quite some time, only a DVD one
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm5
2 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4810a50b5..f51c0193f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- do not die if network cannot be started for updates (mga#8819),
just log the faillure and offer to either retry or abort
+- do not offer to add a CD-ROM as supplement media (mga#13671)
- fix urpmi media when installing from USB (mga#5690)
- locale setting
o fix reading back IM config (mga#15761)
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index c5b4608f6..351e14cf6 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -159,7 +159,6 @@ Do you have a supplementary installation medium to configure?",
my %l = my @l = (
'' => N("None"),
- 'cdrom' => N("CD-ROM"),
'http' => N("Network (HTTP)"),
'ftp' => N("Network (FTP)"),
'nfs' => N("Network (NFS)"),
@@ -285,8 +284,6 @@ sub ask_suppl_media_url {
if (member($method, qw(ftp http))) {
install::any::ask_mirror($o, 'distrib', $o_url);
- } elsif ($method eq 'cdrom') {
- 'cdrom://';
} elsif ($method eq 'nfs') {
my ($host, $dir) = $o_url ? $o_url =~ m!nfs://(.*?)(/.*)! : ();
$o->ask_from_(
@@ -324,7 +321,7 @@ sub selectSupplMedia {
my $method = ask_suppl_media_method($o) or return;
#- configure network if needed
- if (!scalar keys %{$o->{net}{ifcfg}} && $method !~ /^(?:cdrom|disk)/ && !$::local_install) {
+ if (!scalar keys %{$o->{net}{ifcfg}} && $method !~ /^(?:disk)/ && !$::local_install) {
prep_net_suppl_media($o);
}