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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-21 14:12:34 +0000 (Èt, 21 lis 2013)
New Revision: 5149

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/14_bootloader_advice.diff
   trunk/zfsutils/debian/patches/series
Log:
Make 14_bootloader_advice.diff more pallatable to upstream.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2013-11-21 08:47:01 UTC (rev 5148)
+++ trunk/zfsutils/debian/changelog	2013-11-21 14:12:34 UTC (rev 5149)
@@ -1,3 +1,9 @@
+zfsutils (9.2-4) UNRELEASED; urgency=low
+
+  * Make 14_bootloader_advice.diff more pallatable to upstream.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 21 Nov 2013 15:12:14 +0100
+
 zfsutils (9.2-3) unstable; urgency=high
 
   * Lump cddl/compat/opensolaris patches together into a single patch.

Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2013-11-21 08:47:01 UTC (rev 5148)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2013-11-21 14:12:34 UTC (rev 5149)
@@ -1,42 +1,41 @@
-
-grub2 1.98+20100804-14 (included with squeeze) supports SPA_VERSION up to
-(and including) 23.
-
-grub2 1.99~20101210-1 supports SPA_VERSION up to (and including) 28.
-
-zfsutils ATTOW implements SPA_VERSION 28.
-
 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -4945,11 +4945,11 @@
- 
+@@ -4946,10 +4946,17 @@
  	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"
+ 		    "If you boot from pool '%s', don't forget to update boot code.\n"
++#if defined(__FreeBSD__)
+ 		    "Assuming you use GPT partitioning 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",
+ 		    "\tgpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 da0\n\n",
++#else
++		    "Assuming you use GNU GRUB and da0 is your boot disk\n"
++		    "the following command will do it:\n"
++		    "\n"
 +		    "\tgrub-install /dev/da0\n\n",
++#endif
  		    cb.cb_poolname);
  	}
  
 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
 +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -2701,11 +2701,11 @@
+@@ -2701,11 +2701,18 @@
  			(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 "
++#ifdef __FreeBSD__
+ 			    "Assuming you use GPT partitioning 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"),
+ 			    "\tgpart bootcode -b /boot/pmbr -p "
+ 			    "/boot/gptzfsboot -i 1 da0\n\n"),
++#else
++			    "Assuming you use GNU GRUB and 'da0' is "
++			    "your new boot disk\n"
++			    "you may use the following command:\n\n"
++			    "\tgrub-install /dev/da0\n\n"),
++#endif
  			    zhp->zpool_name, new_disk);
  		}
  		return (0);

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2013-11-21 08:47:01 UTC (rev 5148)
+++ trunk/zfsutils/debian/patches/series	2013-11-21 14:12:34 UTC (rev 5149)
@@ -9,11 +9,11 @@
 gratuitous_dependencies.diff
 #manpage_hyphens.diff
 assfail_protection.diff
+14_bootloader_advice.diff
 
 # Other patches that might or might not be mergeable
 ulong_t.diff
 solaris_rlim64_t.diff
-14_bootloader_advice.diff
 15_pthread_compat.diff
 
 # Patches that are likely to be Debian-specific