diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-09-10 10:34:51 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-09-10 10:34:51 +0000 |
| commit | 325d1285b73e429e7791f6b04ad1088a14466939 (patch) | |
| tree | c35d00da50eabb12f06b48d67fbfe79bb85fc866 | |
| parent | d7c0aad074eaee29a610293da4076a7d6e35d35d (diff) | |
| download | drakx-325d1285b73e429e7791f6b04ad1088a14466939.tar drakx-325d1285b73e429e7791f6b04ad1088a14466939.tar.gz drakx-325d1285b73e429e7791f6b04ad1088a14466939.tar.bz2 drakx-325d1285b73e429e7791f6b04ad1088a14466939.tar.xz drakx-325d1285b73e429e7791f6b04ad1088a14466939.zip | |
fixed test of chooseCD on nfs (always enabled).
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 88086351d..3682899fa 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -487,7 +487,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' && !$::oem; + $o->chooseCD($packages) if $o->{method} eq 'cdrom' && !$::oem; my $availableC = install_steps::choosePackages(@_); my $individual = $::expert; @@ -703,7 +703,7 @@ sub chooseCD { my @mediumsDescr; my %mediumsDescr; - if (0 && !common::usingRamdisk()) { + if (!common::usingRamdisk()) { #- mono-cd in case of no ramdisk foreach (@mediums) { pkgs::mediumDescr($packages, $install_any::boot_medium) eq pkgs::mediumDescr($packages, $_) and next; @@ -727,7 +727,7 @@ sub chooseCD { #- if no other medium available or a poor beginner, we are choosing for him! #- note first CD is always selected and should not be unselected! - #return if @mediumsDescr == () || !$::expert; + return if @mediumsDescr == () || !$::expert; $o->set_help('chooseCD'); $o->ask_many_from_list('', |