Allow use of first sector on btrfs (LP: #757446).

diff --git a/debian/changelog b/debian/changelog
index f5d010ae0f264cdbf0d032852f362090384f95e5..504ab95334ac48badf0a9d10e459c6b0c333cef2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grub2 (1.99~rc1-12) UNRELEASED; urgency=low
     - Fix filename comparison.
     - Take extent offset in account on uncompressed extents.
     - Use filled extent size if available.
+  * Allow use of first sector on btrfs (LP: #757446).
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 11 Apr 2011 14:46:05 +0100
 

diff --git a/debian/patches/btrfs_reserved_sector.patch b/debian/patches/btrfs_reserved_sector.patch
new file mode 100644 (file)
index 0000000..67eb39b
--- /dev/null
+++ b/debian/patches/btrfs_reserved_sector.patch
@@ -0,0 +1,21 @@
+Description: Allow use of first sector on btrfs
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/757446
+Forwarded: yes
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3207
+Last-Update: 2011-04-11
+
+Index: b/grub-core/fs/btrfs.c
+===================================================================
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -1462,6 +1462,9 @@
+     .close = grub_btrfs_close,
+     .uuid = grub_btrfs_uuid,
+     .label = grub_btrfs_label,
++#ifdef GRUB_UTIL
++    .reserved_first_sector = 1,
++#endif
+   };
+ 
+ GRUB_MOD_INIT(btrfs)

diff --git a/debian/patches/series b/debian/patches/series
index a1bc195e1c3033d36f5863262dad07d5b555bf4b..51403a85f2f5af10aaa93da719ecd35708ec4f62 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,3 +32,4 @@ mdraid1x_super_offset.patch
 host_optimise_flush.patch
 mkimage_yeeloong.patch
 loopback_replace.patch
+btrfs_reserved_sector.patch