diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-27 15:33:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-27 15:33:45 +0000 |
| commit | 1ac7cbdb50240853cb0a7324846b2354431cc12d (patch) | |
| tree | fb39d123c91a62e94d52760e4254933915497dde | |
| parent | 36bd229acd27cd559836674e9bde45ab816b9d33 (diff) | |
| download | drakx-backup-do-not-use-1ac7cbdb50240853cb0a7324846b2354431cc12d.tar drakx-backup-do-not-use-1ac7cbdb50240853cb0a7324846b2354431cc12d.tar.gz drakx-backup-do-not-use-1ac7cbdb50240853cb0a7324846b2354431cc12d.tar.bz2 drakx-backup-do-not-use-1ac7cbdb50240853cb0a7324846b2354431cc12d.tar.xz drakx-backup-do-not-use-1ac7cbdb50240853cb0a7324846b2354431cc12d.zip | |
(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
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 1 deletions
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) |