Revision: 2100
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2100
Author: robertmh
Date: 2009-04-13 19:48:44 +0000 (Mon, 13 Apr 2009)
Log Message:
-----------
2009-04-13 Robert Millan <[email protected]>
* util/grub.d/10_freebsd.in: Detect Debian GNU/kFreeBSD and use
that name for menuentries when appropiate.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/util/grub.d/10_freebsd.in
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-04-13 15:37:38 UTC (rev 2099)
+++ trunk/grub2/ChangeLog 2009-04-13 19:48:44 UTC (rev 2100)
@@ -1,3 +1,8 @@
+2009-04-13 Robert Millan <[email protected]>
+
+ * util/grub.d/10_freebsd.in: Detect Debian GNU/kFreeBSD and use
+ that name for menuentries when appropiate.
+
2009-04-13 Felix Zielcke <[email protected]>
* util/grub.d/10_freebsd.in: Add a missing `fi'.
Modified: trunk/grub2/util/grub.d/10_freebsd.in
===================================================================
--- trunk/grub2/util/grub.d/10_freebsd.in 2009-04-13 15:37:38 UTC (rev
2099)
+++ trunk/grub2/util/grub.d/10_freebsd.in 2009-04-13 19:48:44 UTC (rev
2100)
@@ -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 @@
libd...@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 @@
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
