From 841f8b754c5576f941c82bb59c78a6229059f05f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Sep 2011 21:52:06 -0400
Subject: [PATCH] Allow btrfs /boot partition. This is supported by grub2 and
 lilo.

Now that grub2 supports btrfs, it seems best to drop this check.
Although I don't know about other boot loaders, and it's also possible
in some situations for d-i to choose to use grub-legacy, which would
fail on btrfs.
---
 check.d/_numbers               |  1 -
 check.d/no_btrfs_boot          | 32 --------------------------------
 debian/changelog               |  6 ++++++
 debian/partman-btrfs.templates | 18 ------------------
 4 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100755 check.d/no_btrfs_boot

diff --git a/check.d/_numbers b/check.d/_numbers
index 710d9fa..c45e2be 100644
--- a/check.d/_numbers
+++ b/check.d/_numbers
@@ -1,2 +1 @@
 09 nomountpoint_btrfs
-05 no_btrfs_boot
diff --git a/check.d/no_btrfs_boot b/check.d/no_btrfs_boot
deleted file mode 100755
index ef9c180..0000000
--- a/check.d/no_btrfs_boot
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# grub and other bootloaders that read the filesystem do not support /boot
-# on btrfs. (lilo should work). Detect and warn.
-
-. /lib/partman/lib/base.sh
-
-get_btrfs_root_boot () {
-	(for i in /lib/partman/fstab.d/*; do
-		[ -x "$i" ] || continue
-		$i
-	done) |
-	while read fs mp type options dump pass; do
-		if [ "$mp" = / ]; then
-			echo root_type=$type
-		elif [ "$mp" = /boot ]; then
-			echo boot_type=$type
-		fi
-	done
-}
-eval "$(get_btrfs_root_boot)"
-
-if [ "$boot_type" = btrfs ]; then
-	db_input critical partman-btrfs/btrfs_boot || true
-	db_go || exit 1
-	exit 1
-fi
-
-if [ "$boot_type" = "" ] && [ "$root_type" = btrfs ]; then
-	db_input critical partman-btrfs/btrfs_root || true
-	db_go || exit 1
-	exit 1
-fi
diff --git a/debian/changelog b/debian/changelog
index 754c41c..21b1b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+partman-btrfs (7) UNRELEASED; urgency=low
+
+  * Allow btrfs /boot partition. This is supported by grub2 and lilo.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 26 Sep 2011 21:51:07 -0400
+
 partman-btrfs (6) unstable; urgency=low
 
   [ Updated translations ]
diff --git a/debian/partman-btrfs.templates b/debian/partman-btrfs.templates
index ce178ad..6f1227d 100644
--- a/debian/partman-btrfs.templates
+++ b/debian/partman-btrfs.templates
@@ -15,21 +15,3 @@ Type: text
 # :sl1:
 # Short file system name (untranslatable in many languages)
 _Description: btrfs
-
-Template: partman-btrfs/btrfs_root
-Type: error
-# :sl2:
-_Description: btrfs root file system not supported without separate /boot
- Your root file system is a btrfs file system. This is not supported
- by the boot loader used by default by this installer.
- .
- You should use a small /boot partition with another file system, such as ext3.
-
-Template: partman-btrfs/btrfs_boot
-Type: error
-# :sl2:
-_Description: btrfs file system not supported for /boot
- You have mounted a btrfs file system as /boot. This is not supported
- by the boot loader used by default by this installer.
- .
- You should use another file system, such as ext3, for the /boot partition.