--- a/usr/src/grub/grub-0.97/stage2/disk_io.c	Mon Dec 01 12:43:36 2008 -0800
+++ b/usr/src/grub/grub-0.97/stage2/disk_io.c	Mon Dec 01 15:45:45 2008 -0800
@@ -124,11 +124,11 @@
 int current_slice;
 
 /* ZFS root filesystem for booting */
-char current_bootpath[MAXNAMELEN];
 char current_rootpool[MAXNAMELEN];
 char current_bootfs[MAXNAMELEN];
 uint64_t current_bootfs_obj;
-char current_devid[MAXNAMELEN];
+char current_bootpath[MAXPATHLEN];
+char current_devid[MAXPATHLEN];
 int is_zfs_mount;
 unsigned long best_drive;
 unsigned long best_part;