From 54ab683f25bd7e7260772152228c13f0196c31ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Wed, 24 Feb 2010 20:44:22 +0000
Subject: [PATCH] adapt code to use partman-basicfilesystems/no_mount_point

and remove now unused template

r62468
---
 check.d/nomountpoint_btrfs     | 11 ++++++-----
 debian/partman-btrfs.templates | 10 ----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/check.d/nomountpoint_btrfs b/check.d/nomountpoint_btrfs
index f6ce818..2ee8e45 100755
--- a/check.d/nomountpoint_btrfs
+++ b/check.d/nomountpoint_btrfs
@@ -22,12 +22,13 @@ for dev in $DEVICES/*; do
 		case "$filesystem" in
 		    btrfs)
 			[ ! -f "$id/mountpoint" ] || continue
-			db_subst partman-btrfs/no_mount_point PARTITION "$num"
-			db_subst partman-btrfs/no_mount_point FILESYSTEM "$filesystem"
-			db_subst partman-btrfs/no_mount_point DEVICE $(humandev $(cat device))
-			db_input critical partman-btrfs/no_mount_point || true
+			T=partman-basicfilesystems/no_mount_point
+			db_subst $T PARTITION "$num"
+			db_subst $T FILESYSTEM "$filesystem"
+			db_subst $T DEVICE $(humandev $(cat device))
+			db_input critical $T || true
 			db_go || exit 1
-			db_get partman-btrfs/no_mount_point
+			db_get $T
 			if [ "$RET" = true ]; then
 				exit 1
 			fi
diff --git a/debian/partman-btrfs.templates b/debian/partman-btrfs.templates
index 78c8734..f41afeb 100644
--- a/debian/partman-btrfs.templates
+++ b/debian/partman-btrfs.templates
@@ -10,16 +10,6 @@ _Description: Failed to create a file system
  The btrfs file system creation in partition
  #${PARTITION} of ${DEVICE} failed.
 
-Template: partman-btrfs/no_mount_point
-Type: boolean
-# :sl2:
-_Description: Do you want to return to the partitioning menu?
- No mount point is assigned for the btrfs file system in partition
- #${PARTITION} of ${DEVICE}.
- .
- If you do not go back to the partitioning menu and assign a mount point
- from there, this partition will not be used at all.
-
 Template: partman-btrfs/text/specify_mountpoint
 Type: text
 # :sl2: