From 011c414a86b92e8fa8827d4b13a3ab82d8d3e3a8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sat, 27 Apr 2013 15:33:45 +0000
Subject: (add_entry) try harder to get a label for other OSes (mga#9849,9681)

rationale: on systems with lot of OSes and/or using grub2, we may well
have already more than 10 alt entries
---
 perl-install/NEWS          | 2 ++
 perl-install/bootloader.pm | 2 +-
 perl-install/install/NEWS  | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 51af78a63..6ff988873 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
 - diskdrake:
   o only allow 'acl' option for extX & reiserfs (mga#9884)
+- drakboot:
+  o try harder to get a label for other OSes (mga#9849,9681)
 
 Version 15.44 - 23 april 2013
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index d2761c016..74601d740 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -624,7 +624,7 @@ sub add_entry {
 
     my $to_add = $v;
     my $label = $v->{label};
-    for (my $i = 0; $i < 10;) {
+    for (my $i = 0; $i < 100;) {
 	my $conflicting = get_label($label, $bootloader);
 
 	$to_add->{label} = $label;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 18c85f55a..92114f805 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
 - fix doble logging of 'filesystem' installation (mga#7758)
 - install shorewall-ipv6 along shorewall (mga#9401)
+- bootloader:
+  o try harder to get a label for other OSes (mga#9849,9681)
 - partionning:
   o only allow 'acl' option for extX & reiserfs (mga#9884)
 
-- 
cgit v1.2.1