From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 11 Apr 2011 15:06:37 +0000 (+0100)
Subject: * grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set
X-Git-Tag: 1.99~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a9bc0169eced59e03dde36de0958c4d3bf06ee0;p=thirdparty%2Fgrub.git

* grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set
reserved_first_sector to 1.  btrfs reserves plenty of space for boot
loaders.
Reported by: Gene Cumm.  Fixes Ubuntu bug #757446.
---

diff --git a/ChangeLog b/ChangeLog
index dbcbb9651..295a23d1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set
+	reserved_first_sector to 1.  btrfs reserves plenty of space for boot
+	loaders.
+	Reported by: Gene Cumm.  Fixes Ubuntu bug #757446.
+
 2011-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-fstest.c (cmd_cmp): Check that sizes match.
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 179891da8..11b8dba33 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -122,6 +122,9 @@ static struct grub_fs grub_btrfs_fs =
     .dir = grub_btrfs_dir,
     .open = grub_btrfs_open,
     .uuid = grub_btrfs_uuid,
+#ifdef GRUB_UTIL
+    .reserved_first_sector = 1,
+#endif
   };
 
 GRUB_MOD_INIT(btrfs)