From 7ebc2d6ba68f0197edbb9efff71905e42552f223 Mon Sep 17 00:00:00 2001 From: robertmh Date: Mon, 13 Apr 2009 19:48:44 +0000 Subject: [PATCH] 2009-04-13 Robert Millan * util/grub.d/10_freebsd.in: Detect Debian GNU/kFreeBSD and use that name for menuentries when appropiate. --- ChangeLog | 5 +++++ util/grub.d/10_freebsd.in | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c402b14e..e61d45b89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-13 Robert Millan + + * util/grub.d/10_freebsd.in: Detect Debian GNU/kFreeBSD and use + that name for menuentries when appropiate. + 2009-04-13 Felix Zielcke * util/grub.d/10_freebsd.in: Add a missing `fi'. diff --git a/util/grub.d/10_freebsd.in b/util/grub.d/10_freebsd.in index 24dbbd24c..11e3a25c4 100644 --- a/util/grub.d/10_freebsd.in +++ b/util/grub.d/10_freebsd.in @@ -1,7 +1,7 @@ #! /bin/sh -e # grub-mkconfig helper script. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008,2009 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,6 +21,11 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ . ${libdir}/grub/grub-mkconfig_lib +case "${GRUB_DISTRIBUTOR}" in + Debian) OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;; + *) OS="FreeBSD" ;; +esac + if test -e /boot/devices.hints ; then devices=/boot/devices.hints fi @@ -51,7 +56,7 @@ if [ "x$kfreebsd" != "x" ] ; then kfreebsd_fs=${GRUB_FS} cat << EOF -menuentry "FreeBSD" { +menuentry "${OS}" { EOF prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF