summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-26 07:32:54 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-26 07:32:54 +0000
commit5e9e7387b37116b5b4e814cd03db26e65edab95a (patch)
tree7c368c9b4bae53f9cceac7c9aa113eca58509f64
parent8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d (diff)
downloaddrakx-5e9e7387b37116b5b4e814cd03db26e65edab95a.tar
drakx-5e9e7387b37116b5b4e814cd03db26e65edab95a.tar.gz
drakx-5e9e7387b37116b5b4e814cd03db26e65edab95a.tar.bz2
drakx-5e9e7387b37116b5b4e814cd03db26e65edab95a.tar.xz
drakx-5e9e7387b37116b5b4e814cd03db26e65edab95a.zip
Factorize and ensure checking main installation method
-rw-r--r--perl-install/install_any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 682e5cb91..b675d057a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -432,6 +432,7 @@ sub prep_net_suppl_media {
sub remountCD1 {
my ($o, $cdrom) = @_;
+ return if install_medium::by_id(1, $o->{packages})->method ne 'cdrom';
openCdromTray($cdrom);
$o->ask_warn('', N("Insert the CD 1 again"));
mountCdrom("/tmp/image", $cdrom);
@@ -456,7 +457,6 @@ sub selectSupplMedia {
#- configure network if needed
prep_net_suppl_media($o) if !scalar keys %{$o->{intf}} && $suppl_method !~ /^(?:cdrom|disk)/;
local $::isWizard = 0;
- my $main_method = $o->{method};
local $o->{method} = $suppl_method;
if ($suppl_method eq 'cdrom') {
(my $cdromdev) = detect_devices::cdroms();
@@ -493,9 +493,9 @@ sub selectSupplMedia {
log::l("Umounting suppl. CD, back to medium 1");
eval { fs::umount("/mnt/cdrom") };
#- re-mount CD 1 if this was a cdrom install
- $main_method eq 'cdrom' and remountCD1($o, $cdrom);
+ remountCD1($o, $cdrom);
} else {
- $main_method eq 'cdrom' and remountCD1($o, $cdrom);
+ remountCD1($o, $cdrom);
return 'error';
}
} else {