summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-05 10:03:01 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-05 10:03:01 +0000
commit1cdb08a708304ee9511f12ccbd403f6147cb9a7f (patch)
treefbc94ce057ec6543cc514d870d5fca73e2c55d3c
parent2ae9fd6598b90404d0b01a9d82e452493efacdaa (diff)
downloaddrakx-1cdb08a708304ee9511f12ccbd403f6147cb9a7f.tar
drakx-1cdb08a708304ee9511f12ccbd403f6147cb9a7f.tar.gz
drakx-1cdb08a708304ee9511f12ccbd403f6147cb9a7f.tar.bz2
drakx-1cdb08a708304ee9511f12ccbd403f6147cb9a7f.tar.xz
drakx-1cdb08a708304ee9511f12ccbd403f6147cb9a7f.zip
avoid asking when using existing partition for magic partition with a real
mntpoint (typically /tmp/hdimage) if we are not using a ramdisk (so partition is not unmountable).
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 3bf701909..c16e04d49 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -290,8 +290,10 @@ sub ask_mntpoint_s {
$o->ask_from('',
_("Choose the mount points"),
[ map { { label => partition_table::description($_),
- val => \$_->{mntpoint}, not_edit => 0, list => [ '', fsedit::suggestions_mntpoint(fsedit::empty_all_hds()) ] }
- } @fstab ]) or return;
+ val => \$_->{mntpoint},
+ not_edit => 0,
+ list => [ '', fsedit::suggestions_mntpoint(fsedit::empty_all_hds()) ] }
+ } grep { !$_->{real_mntpoint} || common::usingRamdisk() } @fstab ]) or return;
}
$o->SUPER::ask_mntpoint_s($fstab);
}