Bug#680850: debian-installer: kfreebsd GRUB menu spacer in wrong place
tags 680850 +patch +pending
thanks
Le dimanche, 8 juillet 2012 11.47:01, Steven Chamberlain a écrit :
> Package: debian-installer
> Version: 20120626
> Tags: wheezy sid
> User: debian-bsd@lists.debian.org
> Usertags: kfreebsd
> X-Debbugs-Cc: debian-bsd@lists.debian.org
>
> Hi,
>
> After the default GNU/kFreeBSD kernel in d-i was changed, one of the
> spacers in GRUB menu entries is in the wrong place. This also means the
> 'default' selected option is wrong. Please see attached screenshot.
Indeed. Fixed in Git with the attached commit.
OdyX
From eb6f6d066d3fc4e1d37fce84b74955c327557735 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sun, 8 Jul 2012 12:18:01 -0600
Subject: [PATCH] Fix the place of the kfreebsd empty line in Grub (Closes:
#680850).
---
build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg | 10 +++++-----
debian/changelog | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg b/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg
index 97a7746..074e481 100644
--- a/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg
+++ b/build/boot/kfreebsd/grub-kfreebsd-cdrom.cfg
@@ -59,11 +59,6 @@ function menuentry_set {
# Default kernel
if test -e /boot/kernel/kfreebsd-9.gz ; then
- # When both options are available, add an empty line in-between.
- if test -e /boot/kernel/kfreebsd.gz ; then
- menuentry "" { true }
- fi
-
menuentry_set /boot/kernel/kfreebsd-9.gz /boot/mfsroot.gz " (using kernel of FreeBSD 9)"
if test -e /boot/gtk/mfsroot.gz ; then
@@ -74,6 +69,11 @@ fi
# Alternate kernel
if test -e /boot/kernel/kfreebsd.gz ; then
+ # When both options are available, add an empty line in-between.
+ if test -e /boot/kernel/kfreebsd.gz ; then
+ menuentry "" { true }
+ fi
+
menuentry_set /boot/kernel/kfreebsd.gz /boot/mfsroot.gz ""
if test -e /boot/gtk/mfsroot.gz ; then
diff --git a/debian/changelog b/debian/changelog
index f9054a3..f8535f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ debian-installer (20120627) UNRELEASED; urgency=low
[ Didier Raboud ]
* Switch the boot backgrounds to the Wheezy joy theme.
+ * Fix the place of the kfreebsd empty line in Grub (Closes: #680850).
-- Julien Cristau <jcristau@debian.org> Tue, 03 Jul 2012 15:11:18 +0200
--
1.7.10.4
Reply to: