Illumos support.

* Makefile.util.def (10_illumos): New script.
	* configure.ac: Set COND_HOST_ILLUMOS.
	* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors) [__sun__]:
	Support Illumos calls.
	(find_partition_start) [__sun__]: Likewise.
	(convert_system_partition_to_system_disk) [__sun__]: Likewise.
	(device_is_wholedisk) [__sun__]: Handle Illumos naming scheme.
	(grub_util_biosdisk_get_grub_dev) [__sun__]: Handle Illumos.
	* util/getroot.c (find_root_device_from_libzfs) [__sun__]: Return raw
	device.
	* util/grub-probe.c (probe) [__sun__]: Do character check.
	* util/grub.d/10_illumos.in: New file.

util/getroot.c

@@ -61,6 +61,11 @@
 # include <grub/util/libnvpair.h>
 #endif
 
+#ifdef __sun__
+# include <sys/types.h>
+# include <sys/mkdev.h>
+#endif
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -289,7 +294,19 @@ find_root_device_from_libzfs (const char *dir)
 	struct stat st;
 	if (stat (device, &st) == 0)
 	  {
-	    device = xstrdup (device);
+#ifdef __sun__
+	    if (grub_memcmp (device, "/dev/dsk/", sizeof ("/dev/dsk/") - 1)
+		== 0)
+	      device = xasprintf ("/dev/rdsk/%s",
+				  device + sizeof ("/dev/dsk/") - 1);
+	    else if (grub_memcmp (device, "/devices", sizeof ("/devices") - 1)
+		     == 0
+		     && grub_memcmp (device + strlen (device) - 4,
+				     ",raw", 4) != 0)
+	      device = xasprintf ("%s,raw", device);
+	    else
+#endif
+	      device = xstrdup (device);
 	    break;
 	  }
 

util/grub-probe.c

@@ -171,7 +171,7 @@ probe (const char *path, char *device_name)
 
   if (path == NULL)
     {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__sun__)
       if (! grub_util_check_char_device (device_name))
         grub_util_error ("%s is not a character device", device_name);
 #else

util/grub.d/10_illumos.in

@@ -0,0 +1,54 @@
+#! /bin/sh
+set -e
+
+# grub-mkconfig helper script.
+# Copyright (C) 2006,2007,2008,2009,2010,2011  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+datarootdir=@datarootdir@
+. ${libdir}/@PACKAGE@/grub-mkconfig_lib
+
+export TEXTDOMAIN=@PACKAGE@
+export TEXTDOMAINDIR=@localedir@
+
+CLASS="--class os"
+
+case "${GRUB_DISTRIBUTOR}" in
+  *)
+	OS="Illumos"
+	CLASS="--class illumos ${CLASS}"
+  ;;
+esac
+
+echo "menuentry '${OS}' ${CLASS} {"
+save_default_entry | sed -e "s/^/\t/"
+prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+message="$(gettext_printf "Loading kernel of Illumos ...")"
+  cat << EOF
+	insmod gzio
+	if cpuid -l ; then
+		ISADIR=amd64
+	else
+		ISADIR=
+	fi
+	zfs-bootfs $($grub_mkrelpath /) ZFS_BOOTFS
+	multiboot $($grub_mkrelpath /platform/i86pc/kernel)/\$ISADIR/unix /platform/i86pc/kernel/\$ISADIR/unix -B \$ZFS_BOOTFS,console=text
+	module $($grub_mkrelpath /platform/i86pc)/\$ISADIR/boot_archive /platform/i86pc/\$ISADIR/boot_archive
+}
+EOF