diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-21 14:51:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-21 14:51:47 +0000 |
| commit | 5d26d0cff18a0899fc14c7a8a0898203d927c860 (patch) | |
| tree | d12f135afa1355a9a56898fc1eb16dafba4aa6f8 | |
| parent | 8a7b93cfc23f2cef362ae8930896a9887083be4e (diff) | |
| download | drakx-backup-do-not-use-5d26d0cff18a0899fc14c7a8a0898203d927c860.tar drakx-backup-do-not-use-5d26d0cff18a0899fc14c7a8a0898203d927c860.tar.gz drakx-backup-do-not-use-5d26d0cff18a0899fc14c7a8a0898203d927c860.tar.bz2 drakx-backup-do-not-use-5d26d0cff18a0899fc14c7a8a0898203d927c860.tar.xz drakx-backup-do-not-use-5d26d0cff18a0899fc14c7a8a0898203d927c860.zip | |
- diskdrake:
o fix setting mount point of a /dev/mdX (#39142)
(regression introduced in 10.8)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fsedit.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 8103fec76..807eb181c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix setting mount point of a /dev/mdX (#39142) + (regression introduced in 10.8) - list gspca, ov51x-jpeg and qc-usb-messenger in webcam modules group - harddrake: o recommend using insensitive search (#39136) diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 2e8f05b2c..f2c363127 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -345,12 +345,13 @@ sub suggest_part { fs::type::set_pt_type($_, $_->{pt_type}) if !exists $_->{fs_type}; } - my $hd_size = fs::get::part2hd($part, $all_hds)->{totalsectors}; + my $hd = fs::get::part2hd($part, $all_hds); + my $hd_size = $hd && $hd->{totalsectors}; # nb: no $hd if $part is /dev/mdX my $has_swap = any { isSwap($_) } fs::get::fstab($all_hds); my @local_suggestions = grep { !$_->{mntpoint} && !$_->{VG_name} || !fs::get::has_mntpoint($_->{mntpoint}, $all_hds) || isSwap($_) && !$has_swap } - grep { !$_->{min_hd_size} || $_->{min_hd_size} <= $hd_size } + grep { !$_->{min_hd_size} || !$hd_size || $_->{min_hd_size} <= $hd_size } grep { !$_->{hd} || $_->{hd} eq $part->{rootDevice} } @$suggestions; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1d08f91a6..15b97d179 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix setting mount point of a /dev/mdX (#39142) + (regression introduced in 10.8) - when skipping bootloader installation, correctly say "None" in summary (#39101) - correctly set country when given lang=xxx on /proc/cmdline |