summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-10-01 17:43:35 +0000
committerFrancois Pons <fpons@mandriva.com>2001-10-01 17:43:35 +0000
commitbe99f97a5936ea968a70655bd6fb9131b082f2fd (patch)
tree0d19e43696c5e7d19131abffda4ee7f874faad00
parent2433d9f4c1e08f30e9ecd4ad180acf59505fa1b2 (diff)
downloaddrakx-be99f97a5936ea968a70655bd6fb9131b082f2fd.tar
drakx-be99f97a5936ea968a70655bd6fb9131b082f2fd.tar.gz
drakx-be99f97a5936ea968a70655bd6fb9131b082f2fd.tar.bz2
drakx-be99f97a5936ea968a70655bd6fb9131b082f2fd.tar.xz
drakx-be99f97a5936ea968a70655bd6fb9131b082f2fd.zip
avoid chooseCD on oem install.
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e793aa449..55ebd053f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -469,7 +469,7 @@ sub choosePackages {
#- this is done at the very beginning to take into account
#- selection of CD by user if using a cdrom.
- $o->chooseCD($packages) if $o->{method} eq 'cdrom';
+ $o->chooseCD($packages) if $o->{method} eq 'cdrom' && !$::oem;
my $availableC = install_steps::choosePackages(@_);
my $individual = $::expert;
@@ -749,7 +749,7 @@ sub installPackages {
my ($method, $medium) = @_;
#- if not using a cdrom medium, always abort.
- $method eq 'cdrom' and do {
+ $method eq 'cdrom' && !$::oem and do {
my $name = pkgs::mediumDescr($o->{packages}, $medium);
local $| = 1; print "\a";
my $r = $name !~ /Application/ || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($com_license), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept");