[Glibc-bsd-commits] r3278 - in trunk/zfsutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-02-23 10:32:32 +0000 (Wed, 23 Feb 2011)
New Revision: 3278

Added:
   trunk/zfsutils/debian/patches/14_bootloader_advice.diff
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/series
Log:
Fix bootloader advice to give instructions on upgrading GRUB.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-02-22 06:44:04 UTC (rev 3277)
+++ trunk/zfsutils/debian/changelog	2011-02-23 10:32:32 UTC (rev 3278)
@@ -3,8 +3,11 @@
   [ Petr Salinger ]
   * Based on FreeBSD 8.2.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 02 Sep 2010 01:41:20 +0200
+  [ Robert Millan ]
+  * Fix bootloader advice to give instructions on upgrading GRUB.
 
+ -- Robert Millan <rmh at debian.org>  Wed, 23 Feb 2011 11:32:17 +0100
+
 zfsutils (8.1-4) unstable; urgency=low
 
   * Create a /boot/zfs/ directory in zfsutils-udeb, so that zpool.cache

Added: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff	                        (rev 0)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2011-02-23 10:32:32 UTC (rev 3278)
@@ -0,0 +1,46 @@
+
+grub-pc 1.98+20100804-14 (included with squeeze) supports SPA_VERSION up to
+(and including) 23.
+
+zfsutils ATTOW implements SPA_VERSION 15.  When it surpasses 23 a GRUB
+update is mandatory and warning message will be necessary (maybe a debconf
+template as well).
+
+Index: zfsutils/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+===================================================================
+--- zfsutils.orig/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	2011-02-23 11:21:17.310006001 +0100
++++ zfsutils/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	2011-02-23 11:20:06.178006002 +0100
+@@ -3608,11 +3608,11 @@
+ 
+ 	if (cb.cb_poolname[0] != '\0') {
+ 		(void) printf(
+-		    "If you boot from pool '%s', don't forget to update boot code.\n"
+-		    "Assuming you use GPT partitioning and da0 is your boot disk\n"
++		    "If you boot from pool '%s', don't forget to update the boot code.\n"
++		    "Assuming you use GNU GRUB and da0 is your boot disk\n"
+ 		    "the following command will do it:\n"
+ 		    "\n"
+-		    "\tgpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 da0\n\n",
++		    "\tgrub-install /dev/da0\n\n",
+ 		    cb.cb_poolname);
+ 	}
+ 
+Index: zfsutils/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+===================================================================
+--- zfsutils.orig/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	2011-02-23 11:21:08.374006002 +0100
++++ zfsutils/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	2011-02-23 11:20:01.282006001 +0100
+@@ -1895,11 +1895,11 @@
+ 			(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
+ 			    "you boot from pool '%s', you may need to update\n"
+ 			    "boot code on newly attached disk '%s'.\n\n"
+-			    "Assuming you use GPT partitioning and 'da0' is "
++			    "Assuming you use GNU GRUB and 'da0' is "
+ 			    "your new boot disk\n"
+ 			    "you may use the following command:\n\n"
+-			    "\tgpart bootcode -b /boot/pmbr -p "
+-			    "/boot/gptzfsboot -i 1 da0\n\n"),
++			    "\tgrub-install "
++			    "/dev/da0\n\n"),
+ 			    zhp->zpool_name, new_disk);
+ 		}
+ 		return (0);

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2011-02-22 06:44:04 UTC (rev 3277)
+++ trunk/zfsutils/debian/patches/series	2011-02-23 10:32:32 UTC (rev 3278)
@@ -11,3 +11,4 @@
 11_endian.diff
 12_freebsd.diff
 13_mnttab.diff
+14_bootloader_advice.diff