summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-07-26 23:07:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-07-26 23:07:09 +0000
commite3adc97309fa31baedbc2b0373d7c4f858b0a788 (patch)
tree9ecadba18e0568b3523e9405b916f853d9f48143 /perl-install
parentd297fd0dbc378b35a7f085fa2f92097f3dfdaed6 (diff)
downloaddrakx-e3adc97309fa31baedbc2b0373d7c4f858b0a788.tar
drakx-e3adc97309fa31baedbc2b0373d7c4f858b0a788.tar.gz
drakx-e3adc97309fa31baedbc2b0373d7c4f858b0a788.tar.bz2
drakx-e3adc97309fa31baedbc2b0373d7c4f858b0a788.tar.xz
drakx-e3adc97309fa31baedbc2b0373d7c4f858b0a788.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm6
-rw-r--r--perl-install/pkgs.pm1
2 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2ae0d2f4c..612a70333 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -359,6 +359,12 @@ sub chooseCD {
my @mediumsDescr = ();
my %mediumsDescr = ();
+ unless (grep { /ram3/ } cat_("/proc/mounts")) {
+ #- mono-cd in case of no ramdisk
+ undef $packages->[2]{$_}{selected} foreach @mediums;
+ return;
+ }
+
#- 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 scalar(@mediums) == 0 || $::beginner;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index d4d8f9493..2ba869eb9 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -417,6 +417,7 @@ sub psUsingHdlists {
#- make sure the first medium is always selected!
#- by default select all image.
psUsingHdlist($prefix, $method, \@packages, $hdlist, $medium, $rpmsdir, $descr, 1);
+
}
log::l("psUsingHdlists read " . scalar keys(%{$packages[0]}) . " headers on " . scalar keys(%{$packages[2]}) . " hdlists");