summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-10-06 20:47:17 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-10-06 20:47:17 +0000
commit4b06a8a57d52b7d5447a1b487b8d33e36b4121b7 (patch)
treea8e4949a3b07c29ab83f9ad224a1fb87c4dca3d0
parent0e4c46e5b8217010393fb1cad354d97021d36c52 (diff)
downloaddrakx-4b06a8a57d52b7d5447a1b487b8d33e36b4121b7.tar
drakx-4b06a8a57d52b7d5447a1b487b8d33e36b4121b7.tar.gz
drakx-4b06a8a57d52b7d5447a1b487b8d33e36b4121b7.tar.bz2
drakx-4b06a8a57d52b7d5447a1b487b8d33e36b4121b7.tar.xz
drakx-4b06a8a57d52b7d5447a1b487b8d33e36b4121b7.zip
do not set mountpoints for rescue partitions (#53504)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/mount_point.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2cde3fa50..50cbd90b2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- add back ram devices support (used by draklive)
+- do not set mountpoints for rescue partitions (#53504)
Version 12.58 - 5 October 2009
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index 4d4880f5d..13c913245 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -47,7 +47,7 @@ sub suggest_mount_points {
sub suggest_mount_points_always {
my ($fstab) = @_;
- my @win = grep { isFat_or_NTFS($_) && maybeFormatted($_) && !$_->{is_removable} && $_->{pt_type} != 0x12 } @$fstab;
+ my @win = grep { isFat_or_NTFS($_) && maybeFormatted($_) && !$_->{is_removable} && $_->{pt_type} != 0x12 && !isRecovery($_)} @$fstab;
log::l("win parts: ", join ",", map { $_->{device} } @win) if @win;
if (@win == 1) {
#- Suggest /boot/efi on ia64.
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index eef6f3089..936496f5f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not set mountpoints for rescue partitions (#53504)
+
Version 12.58 - 05 October 2009
- better describe what usernames we allow (#44783)