diff options
author | Pascal Terjan <pterjan@mageia.org> | 2012-04-19 17:33:27 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@mageia.org> | 2012-04-19 17:33:27 +0000 |
commit | 3506dcf93707f8693a37deff097c9cf7d4a18982 (patch) | |
tree | b6f23b190299f4dedbe4448a2f88667f3ea4b7c9 /perl-install/any.pm | |
parent | 43378c48c4ea689d1e687e4e7122dc0b3372e963 (diff) | |
download | drakx-3506dcf93707f8693a37deff097c9cf7d4a18982.tar drakx-3506dcf93707f8693a37deff097c9cf7d4a18982.tar.gz drakx-3506dcf93707f8693a37deff097c9cf7d4a18982.tar.bz2 drakx-3506dcf93707f8693a37deff097c9cf7d4a18982.tar.xz drakx-3506dcf93707f8693a37deff097c9cf7d4a18982.zip |
When selecting where ro install bootloader, display mountpoint if available, and size+fs_type if we have nothing (mga#5460)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r-- | perl-install/any.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 67a8481d5..021a4b004 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -415,7 +415,12 @@ sub setupBootloader__general { foreach (bootloader::allowed_boot_parts($b, $all_hds)) { my $dev = "/dev/$_->{device}"; push @boot_devices, $dev; - my $name = $_->{info} || $_->{device_LABEL}; + my $desc = formatXiB($_->{size}*512); + my $name = $_->{mntpoint} || $_->{info} || $_->{device_LABEL}; + unless ($name) { + $name = formatXiB($_->{size}*512) . " " if $_->{size}; + $name .= $_->{fs_type}; + } $boot_devices{$dev} = $name ? "$dev ($name)" : $dev; } |