diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-11-24 16:11:53 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-11-24 16:11:53 +0000 |
| commit | 73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206 (patch) | |
| tree | d3168739398cf7a3c5ac172c7dbec93942aa77ec | |
| parent | 5f55acfa92bdb9cad5bd76a45725d9c202033acb (diff) | |
| download | drakx-backup-do-not-use-73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206.tar drakx-backup-do-not-use-73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206.tar.gz drakx-backup-do-not-use-73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206.tar.bz2 drakx-backup-do-not-use-73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206.tar.xz drakx-backup-do-not-use-73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206.zip | |
do not suggest Windows mountpoint for mounted partitions (breaks install if the Win partition is the installer media)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/fs/mount_point.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 8a56ce931..3ba2ce194 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,8 @@ o fix SCSI driver module name - partitioning wizard: o unmount swap too when unmounting all partitions + o do not suggest Windows mountpoint for mounted partitions + (breaks install if the Win partition is the installer media) Version 12.78 - 18 November 2009 diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index 6db7575ea..dc1da482c 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 && !isRecovery($_)} @$fstab; + my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && 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 525115f87..dcb41c48c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -7,6 +7,8 @@ o fix SCSI driver module name - partitioning wizard: o unmount swap too when unmounting all partitions + o do not suggest Windows mountpoint for mounted partitions + (breaks install if the Win partition is the installer media) Version 12.77 - 30 October 2009 |