[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#775395: partman-zfs in d-i jessie image does not create grub-compatible /boot ZFS mirror



tags 775395 + patch pending
thanks

Hi KiBi,

Could we have the attached fix for partman-zfs in sid please?
This would be an RC bug, except that it is kfreebsd-any.

Furthermore, could I step in as maintainer (add myself to Uploaders) for
this and just upload it myself?  I believe I'd need a dak dm
authorisation for that.

Thanks,
Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org
From bd30e842861d39b66936716e84dd34c799a69b10 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Sun, 8 Mar 2015 13:11:58 +0000
Subject: [PATCH] Only enable the zpool features GRUB 2.02 supports (Closes:
 #775395)

Do not enable zpool features by default, except those that are
read-only compatible, and lz4_compress which is supported by
grub-pc >> 2.02~ (Closes: #775395)
---
 debian/changelog |  9 +++++++++
 lib/zfs-base.sh  | 12 +++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2ddf4f1..a975046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+partman-zfs (43) unstable; urgency=medium
+
+  * Team upload.
+  * Do not enable zpool features by default, except those that are
+    read-only compatible, and lz4_compress which is supported by
+    grub-pc >> 2.02~ (Closes: #775395)
+
+ -- Steven Chamberlain <steven@pyro.eu.org>  Fri, 27 Feb 2015 23:50:29 +0000
+
 partman-zfs (42) unstable; urgency=low
 
   [ Updated translations ]
diff --git a/lib/zfs-base.sh b/lib/zfs-base.sh
index 636902e..3b7b78a 100644
--- a/lib/zfs-base.sh
+++ b/lib/zfs-base.sh
@@ -386,7 +386,17 @@ vg_create() {
 	vg="$1"
 	shift
 
-	log-output -t partman-zfs zpool create -f -m none -o altroot=/target "$vg" $* || return 1
+	# Feature explicitly supported by grub-pc >> 2.02~, see
+	# spa_feature_names[] in grub-core/fs/zfs/zfs.c
+	features="-o feature@lz4_compress=enabled"
+
+	# Read-only compatible features, according to zpool-features(7)
+	for feature in async_destroy empty_bpobj spacemap_histogram
+	do
+		features="$features -o feature@${feature}=enabled"
+	done
+
+	log-output -t partman-zfs zpool create -f -m none -d $features -o altroot=/target "$vg" $* || return 1
 
 	# Some ZFS versions don't create cachefile when "-o altroot" is used.
 	# Request it explicitly.
-- 
1.8.4.rc3

Attachment: signature.asc
Description: Digital signature


Reply to: