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 | |
| 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)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/any.pm | 7 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 1fd12f8f2..61107602c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,6 +4,9 @@ - interactive::curses: o make sure ranges are always within limits (mga#646) - ensure swap partition is activated in dracut (e.g. for swap on LVM, RAID etc) +- drakboot: + o display mountpoint if available, and size+fs_type if we have nothing + else (mga#5460) Version 14.3 - 7 April 2012 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; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 6400db295..8332e0c39 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- when selecting where ro install bootloader, display mountpoint if + available, and size+fs_type if we have nothing (mga#5460) + Version 14.6 - 18 April 2012 - individual package selection: |