From 3cc01cfd001e7f0f44f65c1628fa3f72a03c5fea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Feb 2010 20:45:34 +0000 Subject: [PATCH] onvert code to use template from partman-basicfilesystems, and remove identical partman-btrfs/text/specify_mountpoint template. r62476 --- active_partition/btrfs/choices | 2 +- debian/partman-btrfs.templates | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/active_partition/btrfs/choices b/active_partition/btrfs/choices index 262746a..3a18566 100755 --- a/active_partition/btrfs/choices +++ b/active_partition/btrfs/choices @@ -32,7 +32,7 @@ choice_mountpoint () { db_metaget partman-basicfilesystems/text/no_mountpoint description mp="$RET" fi - db_metaget partman-btrfs/text/specify_mountpoint description + db_metaget partman-basicfilesystems/text/specify_mountpoint description printf "mountpoint\t%s\${!TAB}%s\n" "$RET" "$mp" ;; esac diff --git a/debian/partman-btrfs.templates b/debian/partman-btrfs.templates index f41afeb..539d86a 100644 --- a/debian/partman-btrfs.templates +++ b/debian/partman-btrfs.templates @@ -10,12 +10,6 @@ _Description: Failed to create a file system The btrfs file system creation in partition #${PARTITION} of ${DEVICE} failed. -Template: partman-btrfs/text/specify_mountpoint -Type: text -# :sl2: -# This is an item in the menu "Partition settings" -_Description: Mount point: - Template: partman-btrfs/text/btrfs Type: text # :sl2: