2009-04-13 Robert Millan <rmh@aybabtu.com>

        * util/grub.d/10_freebsd.in: Detect Debian GNU/kFreeBSD and use
        that name for menuentries when appropiate.

diff --git a/ChangeLog b/ChangeLog
index 4c402b14e71ac3029c712ef9c0c497657e9af585..e61d45b895844fd06dad5447ac8e74df7d1c4558 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13  Robert Millan  <rmh@aybabtu.com>
+
+       * util/grub.d/10_freebsd.in: Detect Debian GNU/kFreeBSD and use
+       that name for menuentries when appropiate.
+
 2009-04-13  Felix Zielcke  <fzielcke@z-51.de>
 
        * 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 24dbbd24c0e35dfd8ae9afcb4b2a417f45d284ed..11e3a25c4a1708cf02f6864c3cc0ac886d7caa85 100644 (file)
--- 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