From 4b9f16cbf639e5a8a094bba8213a7c5a1c2d0595 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sat, 17 Dec 2011 20:07:37 +0000
Subject: (setupBootloader__entries) display partition labels when adding a
 foreign OS

(similar to previous commit, maybe should we share some helper for
devices listing & GUI-formating)
---
 perl-install/NEWS   | 1 +
 perl-install/any.pm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index b7a81080e..f00282d8a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
 - drakboot:
   o display partition labels in list instead of just disk names in "boot
     device" choice
+  o display partition labels when adding a foreign OS
 - harddrake: fix missing names (mga#3745)
 
 Version 13.72.1 - 11 December 2011
diff --git a/perl-install/any.pm b/perl-install/any.pm
index b43c41272..085542204 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -539,7 +539,8 @@ sub setupBootloader__entries {
 	my %root_descr = map { 
 	    my $info = delete $hd_infos{$_->{rootDevice}};
 	    my $dev = "/dev/$_->{device}";
-	    my $info_ = $info ? "$dev ($info)" : $dev;
+	    my $hint = $info || $_->{info} || $_->{device_LABEL};
+	    my $info_ = $hint ? "$dev ($hint)" : $dev;
 	    ($dev => $info_, fs::wild_device::from_part('', $_) => $info_);
 	} @$fstab;
 
-- 
cgit v1.2.1