summaryrefslogtreecommitdiffstats
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
commitf04b4eb7e63f64732556efe2bd5828667beda8f1 (patch)
tree7173d95983e2f2f97f5f689e93beb3c68708c1de
parent083c78e58f4dfae3e2351789557ec1f7c25a29f1 (diff)
downloaddrakx-backup-do-not-use-f04b4eb7e63f64732556efe2bd5828667beda8f1.tar
drakx-backup-do-not-use-f04b4eb7e63f64732556efe2bd5828667beda8f1.tar.gz
drakx-backup-do-not-use-f04b4eb7e63f64732556efe2bd5828667beda8f1.tar.bz2
drakx-backup-do-not-use-f04b4eb7e63f64732556efe2bd5828667beda8f1.tar.xz
drakx-backup-do-not-use-f04b4eb7e63f64732556efe2bd5828667beda8f1.zip
fix other Mga OS names in menu (mga#8710)
(reverting one of latest bogus Rosa bits)
-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: