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

[Robert Millan]

Author: rmh
Date: 2011-10-22 09:08:18 +0000 (Sat, 22 Oct 2011)
New Revision: 3752

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/patches/14_bootloader_advice.diff
Log:
  * Add Breaks on GRUB versions that don't support ZFS v28.  Also improve
    documentation of this issue in 14_bootloader_advice.diff.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-10-21 20:30:03 UTC (rev 3751)
+++ trunk/zfsutils/debian/changelog	2011-10-22 09:08:18 UTC (rev 3752)
@@ -18,8 +18,10 @@
     not available anymore; also stop on runlevel 1.
   * Fix manpage hyphens and convert into spaces.
   * Improve package descriptions.
+  * Add Breaks on GRUB versions that don't support ZFS v28.  Also improve
+    documentation of this issue in 14_bootloader_advice.diff.
 
- -- Robert Millan <rmh at debian.org>  Fri, 21 Oct 2011 22:26:10 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 22 Oct 2011 11:07:09 +0200
 
 zfsutils (8.2-4) unstable; urgency=high
 

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2011-10-21 20:30:03 UTC (rev 3751)
+++ trunk/zfsutils/debian/control	2011-10-22 09:08:18 UTC (rev 3752)
@@ -98,6 +98,9 @@
 Package: zfsutils
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+# Require GRUB with ZFS v28 support to ensure "zpool upgrade" doesn't render
+# system unbootable.
+Breaks: grub-common (<< 1.99~20101210-1~)
 Description: command-line tools to manage ZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data integrity,
  supporting data snapshots, multiple copies, and data checksums.

Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2011-10-21 20:30:03 UTC (rev 3751)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2011-10-22 09:08:18 UTC (rev 3752)
@@ -1,15 +1,10 @@
 
-grub-pc 1.98+20100804-14 (included with squeeze) supports SPA_VERSION up to
+grub2 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).
+grub2 1.99~20101210-1 supports SPA_VERSION up to (and including) 28.
 
----
- cddl/contrib/opensolaris/cmd/zpool/zpool_main.c          |    6 +++---
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c |    6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+zfsutils ATTOW implements SPA_VERSION 28.
 
 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c