summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-06 00:56:24 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-06 00:56:24 +0000
commita6ff7c5d5c9a4a8cf6fccd5fa6c5bc369755f34b (patch)
tree7173d95983e2f2f97f5f689e93beb3c68708c1de /perl-install
parenta45b8e5ae9ce3a09aa27ecb10fadac7e295c5b9a (diff)
downloaddrakx-a6ff7c5d5c9a4a8cf6fccd5fa6c5bc369755f34b.tar
drakx-a6ff7c5d5c9a4a8cf6fccd5fa6c5bc369755f34b.tar.gz
drakx-a6ff7c5d5c9a4a8cf6fccd5fa6c5bc369755f34b.tar.bz2
drakx-a6ff7c5d5c9a4a8cf6fccd5fa6c5bc369755f34b.tar.xz
drakx-a6ff7c5d5c9a4a8cf6fccd5fa6c5bc369755f34b.zip
fix other Mga OS names in menu (mga#8710)
(reverting one of latest bogus Rosa bits)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5ae57d91b..e1af7978b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o fix other Mga OS names in menu (mga#8710)
+
Version 15.35 - 5 April 2013
- diskdrake:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index d8146905d..d2761c016 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2203,7 +2203,7 @@ sub find_other_distros_grub_conf {
} else {
log::l("could not recognise the distribution for $e->{grub_conf} in $e->{bootpart}{device}");
}
- $e->{name} = $e->{menuentry} || "Linux $e->{bootpart}{device}";
+ $e->{name} ||= "Linux $e->{bootpart}{device}";
push @found, $e;
}
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4168ce576..808676134 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader:
+ o fix other Mga OS names in menu (mga#8710)
+
Version 15.35 - 5 April 2013
- bootloader: