Merge lp:~csurbhi/ubuntu/maverick/gparted/gparted.fix-598946 into lp:ubuntu/maverick/gparted

[Surbhi Palande]

This patch fixes the bug 598946 on LP. It adds the following btrfs support to gparted:
1) btrfs.mkfs
2) btrfs.fsck
3) btrfs-show
using the external btrfs-tools.

The original patch was fetched from https://bugzilla.gnome.org/show_bug.cgi?id=571170
It was slightly modified so as to keep the original support of btrfs detection intact. The original patch adds all the support in #if BTRFS_SUPPORT. Kept the original btrfs detection code in gparted in the #else part so as to allow btrfs partition from being detected even when gparted is compiled without BTRFS_SUPPORT = 1.
On the other hand when gparted is compiled with BTRFS_SUPPORT, the extra functionality along with detection is added.

Do consider merging this for maverick.

Thanks!

[Colin Watson (cjwatson)]

Thanks for working on this bug.

The gparted package uses the newish 3.0 (quilt) source package format,
according to debian/source/format, so you need to do a bit more than
applying the patch directly to the source tree. Follow the directions
in /usr/share/doc/quilt/README.source to set up .quiltrc; you might also
want to set QUILT_REFRESH_ARGS="--no-timestamps -p ab" or similar. Then
import your patch; the least error-prone way is probably to start from a
clean checkout of lp:ubuntu/gparted, run 'quilt new 02_btrfs.patch',
then 'quilt shell', make your changes, exit, and run 'quilt refresh'
(although there are other faster ways).

(Debian is converging on 3.0 (quilt), so it's a useful one to learn,
although many packages also use older patch systems so we still have to
be pretty flexible. There's a wrapper script in
lp:~mvo/+junk/edit-patch which may be useful.)

You'll need to 'bzr add' the new file under debian/patches/ at the end.
You should end up with a 'bzr diff' that shows both the raw changes and
a new file in debian/patches/ with those same changes (this may seem a
bit odd but it's a trade-off against other useful properties that I can
describe elsewhere if you're interested).

The patch changes configure.in, but not configure. I think you'll need
to run 'autoreconf' inside 'quilt shell' in order for this change to
take effect.

It seems a bit odd to have this support be configured by a configure
option, but I see that this was in one of the upstream patches so it's
not necessary to undo that. In any case, it looks like the current
state of your branch won't build it in by default. You should add
--enable-btrfs to the configure options in debian/rules (make this
change directly rather than as a quilt patch).

[Surbhi Palande (csurbhi)]

Created a new bzr branch with the above comments. This is kept at code.edge.launchpad.net/~csurbhi/ubuntu/maverick/gparted/gparted-fix.598946/
Shall delete this branch soon.

[Surbhi Palande (csurbhi)]

1) Changed the debian/patches/02-btrfs.patch with the correct quilt commands.
2) Changed the configure.in to enable btrfs support by default. To disable btrfs support, ./configure should be invoked with --enable-btrfs=no

[Surbhi Palande (csurbhi)]

duplicate of https://code.edge.launchpad.net/~csurbhi/ubuntu/maverick/gparted/gparted-fix.598946/+merge/29461

[lp:~csurbhi/ubuntu/maverick/gparted/gparted.fix-598946]

24. By Surbhi Palande on 2010-07-14

Added btrfs support (mkfs, fsck, show) to gparted. Original patch came
from https://bugzilla.gnome.org/attachment.cgi?id=128768 . (LP: #598946)

[Colin Watson (cjwatson)]

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-03-14 12:54:22 +0000
+++ .pc/applied-patches	2010-07-14 16:03:42 +0000
@@ -1,1 +1,2 @@
 01_fix-desktop.patch
+02-btrfs.patch

=== modified file 'configure.in'
--- configure.in	2010-03-14 12:54:22 +0000
+++ configure.in	2010-07-14 16:03:42 +0000
@@ -170,6 +170,22 @@
 
 AM_CONDITIONAL(DISABLE_DOC, test ${enable_doc} = no)
 
+dnl ******************************
+dnl Optional btrfs support
+dnl ******************************
+
+with_btrfs="yes"
+AC_ARG_ENABLE(	btrfs,
+		AS_HELP_STRING([--enable-btrfs], [enable experimental btrfs support (enabled by default)]),
+       		with_btrfs=$enableval)
+
+if test "x$with_btrfs" = "xyes"; then
+	AC_DEFINE(BTRFS_SUPPORT,1,[Build in btrfs support])
+else
+        with_btrfs="no"
+fi
+AM_CONDITIONAL(BTRFS_SUPPORT, test "x$with_btrfs" = "xyes")
+
 
 AC_CONFIG_FILES([
 Makefile
@@ -194,6 +210,8 @@
 echo "================ Final configuration ==================="
 echo "          Installing into prefix  :  $prefix"
 echo ""
+echo "           Enable btrfs support?  :  $with_btrfs"
+echo ""
 echo "            Build documentation?  :  $enable_doc"
 echo ""
 echo "    Need pt re-read work around?  :  $need_pt_reread_work_around"

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-22 13:10:57 +0000
+++ debian/changelog	2010-07-14 16:03:42 +0000
@@ -1,3 +1,10 @@
+gparted (0.5.2-2ubuntu1) maverick; urgency=low
+
+  * Added btrfs support (mkfs, fsck, show) to gparted. Original patch came
+    from https://bugzilla.gnome.org/attachment.cgi?id=128768 . (LP: #598946)
+
+ -- Surbhi Palande <[e-mail]>  Tue, 13 Jul 2010 16:57:36 +0300
+
 gparted (0.5.2-2) unstable; urgency=low
 
   * Rebuild against parted 2.2

=== added file 'debian/patches/02-btrfs.patch'
--- debian/patches/02-btrfs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-btrfs.patch	2010-07-14 16:03:42 +0000
@@ -0,0 +1,410 @@
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -170,6 +170,22 @@
+ 
+ AM_CONDITIONAL(DISABLE_DOC, test ${enable_doc} = no)
+ 
++dnl ******************************
++dnl Optional btrfs support
++dnl ******************************
++
++with_btrfs="yes"
++AC_ARG_ENABLE(	btrfs,
++		AS_HELP_STRING([--enable-btrfs], [enable experimental btrfs support (enabled by default)]),
++       		with_btrfs=$enableval)
++
++if test "x$with_btrfs" = "xyes"; then
++	AC_DEFINE(BTRFS_SUPPORT,1,[Build in btrfs support])
++else
++        with_btrfs="no"
++fi
++AM_CONDITIONAL(BTRFS_SUPPORT, test "x$with_btrfs" = "xyes")
++
+ 
+ AC_CONFIG_FILES([
+ Makefile
+@@ -194,6 +210,8 @@
+ echo "================ Final configuration ==================="
+ echo "          Installing into prefix  :  $prefix"
+ echo ""
++echo "           Enable btrfs support?  :  $with_btrfs"
++echo ""
+ echo "            Build documentation?  :  $enable_doc"
+ echo ""
+ echo "    Need pt re-read work around?  :  $need_pt_reread_work_around"
+Index: b/include/Makefile.am
+===================================================================
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -1,5 +1,9 @@
+ gparted_includedir = $(pkgincludedir)
+ 
++if BTRFS_SUPPORT
++btrfs_source = btrfs.h
++endif
++
+ EXTRA_DIST = \
+ 	Device.h 			\
+ 	Dialog_Base_Partition.h		\
+@@ -48,4 +52,5 @@
+ 	reiser4.h   			\
+ 	reiserfs.h  			\
+ 	ufs.h  				\
+-	xfs.h
++	xfs.h				\
++	$(btrfs_source)			
+Index: b/include/Utils.h
+===================================================================
+--- a/include/Utils.h
++++ b/include/Utils.h
+@@ -66,11 +66,18 @@
+ 	FS_HFS		= 15,
+ 	FS_HFSPLUS	= 16,
+ 	FS_UFS		= 17,
++#if BTRFS_SUPPORT
++	FS_BTRFS	= 18,
+ 
+-	FS_USED		= 18,
+-	FS_UNUSED	= 19,
++	FS_USED		= 19,
++	FS_UNUSED	= 20,
++#else
++        FS_USED         = 18,
++        FS_UNUSED       = 19,
++
++        FS_BTRFS        = 20,  /* FIXME: Move this higher up list when full support added */
++#endif
+ 
+-	FS_BTRFS	= 20,  /* FIXME: Move this higher up list when full support added */
+ 	FS_LVM2		= 21,
+ 	FS_LUKS		= 22
+ } ;
+Index: b/include/btrfs.h
+===================================================================
+--- /dev/null
++++ b/include/btrfs.h
+@@ -0,0 +1,42 @@
++/* Copyright (C) 2009 Luca Bruno <[e-mail]>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Library General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++ 
++ 
++#ifndef BTRFS_H_
++#define BTRFS_H_
++
++#include "../include/FileSystem.h"
++
++namespace GParted
++{
++class btrfs : public FileSystem
++{
++public:
++	FS get_filesystem_support() ;
++	void set_used_sectors( Partition & partition ) ;
++	void read_label( Partition & partition ) ;
++	bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
++	bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
++	bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
++	bool copy( const Glib::ustring & src_part_path,
++		   const Glib::ustring & dest_part_path,
++		   OperationDetail & operationdetail ) ;
++	bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
++};
++} //GParted
++
++#endif //BTRFS_H_
+Index: b/src/GParted_Core.cc
+===================================================================
+--- a/src/GParted_Core.cc
++++ b/src/GParted_Core.cc
+@@ -27,6 +27,7 @@
+ #include "../include/OperationFormat.h"
+ #include "../include/OperationResizeMove.h"
+ #include "../include/OperationLabelPartition.h"
++#include "../config.h"
+ 
+ #include "../include/ext2.h"
+ #include "../include/ext3.h"
+@@ -42,7 +43,9 @@
+ #include "../include/hfsplus.h"
+ #include "../include/reiser4.h"
+ #include "../include/ufs.h"
+-
++#ifdef BTRFS_SUPPORT
++#include "../include/btrfs.h"
++#endif
+ #include <set>
+ #include <cerrno>
+ #include <cstring>
+@@ -127,12 +130,17 @@
+ 
+ 	xfs fs_xfs;
+ 	FILESYSTEMS .push_back( fs_xfs .get_filesystem_support() ) ;
+-
++	
+ 	FS *fs ;
++#ifdef BTRFS_SUPPORT
++	btrfs fs_btrfs;
++	FILESYSTEMS .push_back( fs_btrfs .get_filesystem_support() ) ;
++#else
+ 	//btrfs  FIXME:  Add full support when on-disk-format stabilized
+ 	fs = new( FS ) ;
+ 	fs ->filesystem = GParted::FS_BTRFS ;
+ 	FILESYSTEMS .push_back( * fs ) ;
++#endif
+ 
+ 	//lvm2 physical volume -- not a file system
+ 	fs = new( FS ) ;
+@@ -972,26 +980,23 @@
+ 	if ( Glib::ustring( buf ) == "ReIsEr4" )
+ 		return GParted::FS_REISER4 ;
+ 
+-	//lvm2
+-	//NOTE: lvm2 is not a file system but we do wish to recognize the Physical Volume
+-	char magic1[16] ;
+-	char magic2[16] ;
++#ifdef BTRFS_SUPPORT
++	//btrfs
++	//extemporaneus hack - patch already sent to parted (detection only, there too)
++	#define BTRFS_SUPER_INFO_SIZE 4096
++	#define BTRFS_SUPER_INFO_OFFSET (64 * 1024)	
++	#define BTRFS_SIGNATURE "_BHRfS_M"
++
++	char    buf_btrfs[BTRFS_SUPER_INFO_SIZE];
+ 
+ 	ped_device_open( lp_device );
+-	ped_geometry_read( & lp_partition ->geom, buf, 1, 1 ) ;
+-	strncpy(magic1, buf+0, 8) ;  magic1[8] = '\0' ; //set and terminate string
+-	strncpy(magic2, buf+24, 4) ; magic2[4] = '\0' ; //set and terminate string
++        if (ped_geometry_read( & lp_partition ->geom, buf_btrfs, \
++				(BTRFS_SUPER_INFO_OFFSET / 512), \
++				(BTRFS_SUPER_INFO_SIZE / 512)))
++        	if ( Glib::ustring( buf+64, strlen(BTRFS_SIGNATURE) ) == BTRFS_SIGNATURE)
++                	return GParted::FS_BTRFS;
+ 	ped_device_close( lp_device );
+-
+-	if (    Glib::ustring( magic1 ) == "LABELONE"
+-		 && Glib::ustring( magic2 ) == "LVM2" )
+-	{
+-		temp = _( "Logical Volume Management is not yet supported." ) ;
+-		temp += "\n" ;
+-		partition_temp .messages .push_back( temp ) ;
+-		return GParted::FS_LVM2 ;
+-	}
+-
++#else
+ 	//btrfs
+ 	const Sector BTRFS_SUPER_INFO_SIZE   = 4096 ;
+ 	const Sector BTRFS_SUPER_INFO_OFFSET = (64 * 1024) ;
+@@ -1014,6 +1019,26 @@
+ 		partition_temp .messages .push_back( temp ) ;
+ 		return GParted::FS_BTRFS ;
+ 	}
++#endif
++	//lvm2
++	//NOTE: lvm2 is not a file system but we do wish to recognize the Physical Volume
++	char magic1[16] ;
++	char magic2[16] ;
++
++	ped_device_open( lp_device );
++	ped_geometry_read( & lp_partition ->geom, buf, 1, 1 ) ;
++	strncpy(magic1, buf+0, 8) ;  magic1[8] = '\0' ; //set and terminate string
++	strncpy(magic2, buf+24, 4) ; magic2[4] = '\0' ; //set and terminate string
++	ped_device_close( lp_device );
++
++	if (    Glib::ustring( magic1 ) == "LABELONE"
++		 && Glib::ustring( magic2 ) == "LVM2" )
++	{
++		temp = _( "Logical Volume Management is not yet supported." ) ;
++		temp += "\n" ;
++		partition_temp .messages .push_back( temp ) ;
++		return GParted::FS_LVM2 ;
++	}
+ 
+ 	//no file system found....
+ 	temp = _( "Unable to detect file system! Possible reasons are:" ) ;
+@@ -2599,7 +2624,9 @@
+ 		case FS_HFS		: p_filesystem = new hfs() ; 		break ;
+ 		case FS_HFSPLUS		: p_filesystem = new hfsplus() ; 	break ;
+ 		case FS_UFS		: p_filesystem = new ufs() ;	 	break ;
+-
++#ifdef BTRFS_SUPPORT
++		case FS_BTRFS		: p_filesystem = new btrfs() ;	 	break ;
++#endif
+ 		default			: p_filesystem = NULL ;
+ 	}
+ 
+Index: b/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,6 +7,10 @@
+ 
+ AM_CXXFLAGS = -Wall	
+ 
++if BTRFS_SUPPORT
++btrfs_source = btrfs.cc
++endif
++
+ sbin_PROGRAMS = gpartedbin
+ 
+ gpartedbin_SOURCES = \
+@@ -57,7 +61,8 @@
+ 	reiser4.cc 			\
+ 	reiserfs.cc			\
+ 	ufs.cc				\
+-	xfs.cc
++	xfs.cc				\
++	$(btrfs_source)			
+ 	
+ gpartedbin_LDFLAGS = -lparted -lgthread-2.0 
+ 
+Index: b/src/Utils.cc
+===================================================================
+--- a/src/Utils.cc
++++ b/src/Utils.cc
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include "../include/Utils.h"
++#include "../config.h"
+ 
+ #include <sstream>
+ #include <iomanip>
+@@ -161,6 +162,9 @@
+ 		case FS_REISER4     : return "reiser4progs" ;
+ 		case FS_REISERFS    : return "reiserfsprogs" ;
+ 		case FS_UFS         : return "" ;
++#ifdef BTRFS_SUPPORT
++		case FS_BTRFS       : return "btrfs-tools" ;
++#endif
+ 		case FS_XFS         : return "xfsprogs" ;
+ 
+ 		default             : return "" ;
+Index: b/src/btrfs.cc
+===================================================================
+--- /dev/null
++++ b/src/btrfs.cc
+@@ -0,0 +1,107 @@
++/* Copyright (C) 2009 Luca Bruno <[e-mail]>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU Library General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++ 
++ 
++#include "../include/btrfs.h"
++
++namespace GParted
++{
++
++FS btrfs::get_filesystem_support()
++{
++	FS fs ;
++	fs .filesystem = GParted::FS_BTRFS ;
++	
++	if ( ! Glib::find_program_in_path( "btrfs-show" ) .empty() )
++	{
++		fs .read = GParted::FS::EXTERNAL ;
++		fs .read_label = FS::EXTERNAL ;
++	}
++
++	if ( ! Glib::find_program_in_path( "mkfs.btrfs" ) .empty() )
++		fs .create = GParted::FS::EXTERNAL ;
++	
++	if ( ! Glib::find_program_in_path( "btrfsck" ) .empty() )
++		fs .check = GParted::FS::EXTERNAL ;
++		
++	if ( fs .check )
++	{
++		fs .copy = GParted::FS::GPARTED ;
++		fs .move = GParted::FS::GPARTED ;
++	}
++
++	fs .MIN = 256 * MEBIBYTE ;
++	
++	return fs ;
++}
++
++bool btrfs::create( const Partition & new_partition, OperationDetail & operationdetail )
++{
++	return (! execute_command( "mkfs.btrfs -L \"" + new_partition .label + "\" " + new_partition .get_path(), operationdetail ) );
++}
++
++bool btrfs::check_repair( const Partition & partition, OperationDetail & operationdetail )
++{
++	return (! execute_command( "btrfsck " + partition .get_path(), operationdetail )) ;
++}
++
++void btrfs::set_used_sectors( Partition & partition )
++{
++// TODO
++    return;
++}
++
++bool btrfs::write_label( const Partition & partition, OperationDetail & operationdetail )
++{
++// TODO
++        return true ;
++}
++
++bool btrfs::copy( const Glib::ustring & src_part_path,
++                    const Glib::ustring & dest_part_path,
++                    OperationDetail & operationdetail )
++{
++// TODO
++        return true ;
++}
++
++bool btrfs::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
++{
++// TODO
++        return true ;
++}
++
++void btrfs::read_label( Partition & partition )
++{
++        if ( ! Utils::execute_command( "btrfs-show " + partition .get_path(), output, error, true ) )
++        {
++                partition .label = Utils::regexp_label( output, "^Label ([^\n\t]*)" ) ;
++        }
++        else
++        {
++                if ( ! output .empty() )
++                        partition .messages .push_back( output ) ;
++
++                if ( ! error .empty() )
++                        partition .messages .push_back( error ) ;
++        }
++
++}
++
++} //GParted
++
++

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-11-07 20:00:00 +0000
+++ debian/patches/series	2010-07-14 16:03:42 +0000
@@ -1,1 +1,2 @@
 01_fix-desktop.patch
+02-btrfs.patch

=== modified file 'include/Makefile.am'
--- include/Makefile.am	2009-12-15 12:06:03 +0000
+++ include/Makefile.am	2010-07-14 16:03:42 +0000
@@ -1,5 +1,9 @@
 gparted_includedir = $(pkgincludedir)
 
+if BTRFS_SUPPORT
+btrfs_source = btrfs.h
+endif
+
 EXTRA_DIST = \
 	Device.h 			\
 	Dialog_Base_Partition.h		\
@@ -48,4 +52,5 @@
 	reiser4.h   			\
 	reiserfs.h  			\
 	ufs.h  				\
-	xfs.h
+	xfs.h				\
+	$(btrfs_source)			

=== modified file 'include/Utils.h'
--- include/Utils.h	2010-01-27 12:50:10 +0000
+++ include/Utils.h	2010-07-14 16:03:42 +0000
@@ -66,11 +66,18 @@
 	FS_HFS		= 15,
 	FS_HFSPLUS	= 16,
 	FS_UFS		= 17,
-
-	FS_USED		= 18,
-	FS_UNUSED	= 19,
-
-	FS_BTRFS	= 20,  /* FIXME: Move this higher up list when full support added */
+#if BTRFS_SUPPORT
+	FS_BTRFS	= 18,
+
+	FS_USED		= 19,
+	FS_UNUSED	= 20,
+#else
+        FS_USED         = 18,
+        FS_UNUSED       = 19,
+
+        FS_BTRFS        = 20,  /* FIXME: Move this higher up list when full support added */
+#endif
+
 	FS_LVM2		= 21,
 	FS_LUKS		= 22
 } ;

=== modified file 'src/GParted_Core.cc'
--- src/GParted_Core.cc	2010-03-14 12:54:22 +0000
+++ src/GParted_Core.cc	2010-07-14 16:03:42 +0000
@@ -27,6 +27,7 @@
 #include "../include/OperationFormat.h"
 #include "../include/OperationResizeMove.h"
 #include "../include/OperationLabelPartition.h"
+#include "../config.h"
 
 #include "../include/ext2.h"
 #include "../include/ext3.h"
@@ -42,7 +43,9 @@
 #include "../include/hfsplus.h"
 #include "../include/reiser4.h"
 #include "../include/ufs.h"
-
+#ifdef BTRFS_SUPPORT
+#include "../include/btrfs.h"
+#endif
 #include <set>
 #include <cerrno>
 #include <cstring>
@@ -127,12 +130,17 @@
 
 	xfs fs_xfs;
 	FILESYSTEMS .push_back( fs_xfs .get_filesystem_support() ) ;
-
+	
 	FS *fs ;
+#ifdef BTRFS_SUPPORT
+	btrfs fs_btrfs;
+	FILESYSTEMS .push_back( fs_btrfs .get_filesystem_support() ) ;
+#else
 	//btrfs  FIXME:  Add full support when on-disk-format stabilized
 	fs = new( FS ) ;
 	fs ->filesystem = GParted::FS_BTRFS ;
 	FILESYSTEMS .push_back( * fs ) ;
+#endif
 
 	//lvm2 physical volume -- not a file system
 	fs = new( FS ) ;
@@ -972,26 +980,23 @@
 	if ( Glib::ustring( buf ) == "ReIsEr4" )
 		return GParted::FS_REISER4 ;
 
-	//lvm2
-	//NOTE: lvm2 is not a file system but we do wish to recognize the Physical Volume
-	char magic1[16] ;
-	char magic2[16] ;
+#ifdef BTRFS_SUPPORT
+	//btrfs
+	//extemporaneus hack - patch already sent to parted (detection only, there too)
+	#define BTRFS_SUPER_INFO_SIZE 4096
+	#define BTRFS_SUPER_INFO_OFFSET (64 * 1024)	
+	#define BTRFS_SIGNATURE "_BHRfS_M"
+
+	char    buf_btrfs[BTRFS_SUPER_INFO_SIZE];
 
 	ped_device_open( lp_device );
-	ped_geometry_read( & lp_partition ->geom, buf, 1, 1 ) ;
-	strncpy(magic1, buf+0, 8) ;  magic1[8] = '\0' ; //set and terminate string
-	strncpy(magic2, buf+24, 4) ; magic2[4] = '\0' ; //set and terminate string
+        if (ped_geometry_read( & lp_partition ->geom, buf_btrfs, \
+				(BTRFS_SUPER_INFO_OFFSET / 512), \
+				(BTRFS_SUPER_INFO_SIZE / 512)))
+        	if ( Glib::ustring( buf+64, strlen(BTRFS_SIGNATURE) ) == BTRFS_SIGNATURE)
+                	return GParted::FS_BTRFS;
 	ped_device_close( lp_device );
-
-	if (    Glib::ustring( magic1 ) == "LABELONE"
-		 && Glib::ustring( magic2 ) == "LVM2" )
-	{
-		temp = _( "Logical Volume Management is not yet supported." ) ;
-		temp += "\n" ;
-		partition_temp .messages .push_back( temp ) ;
-		return GParted::FS_LVM2 ;
-	}
-
+#else
 	//btrfs
 	const Sector BTRFS_SUPER_INFO_SIZE   = 4096 ;
 	const Sector BTRFS_SUPER_INFO_OFFSET = (64 * 1024) ;
@@ -1014,6 +1019,26 @@
 		partition_temp .messages .push_back( temp ) ;
 		return GParted::FS_BTRFS ;
 	}
+#endif
+	//lvm2
+	//NOTE: lvm2 is not a file system but we do wish to recognize the Physical Volume
+	char magic1[16] ;
+	char magic2[16] ;
+
+	ped_device_open( lp_device );
+	ped_geometry_read( & lp_partition ->geom, buf, 1, 1 ) ;
+	strncpy(magic1, buf+0, 8) ;  magic1[8] = '\0' ; //set and terminate string
+	strncpy(magic2, buf+24, 4) ; magic2[4] = '\0' ; //set and terminate string
+	ped_device_close( lp_device );
+
+	if (    Glib::ustring( magic1 ) == "LABELONE"
+		 && Glib::ustring( magic2 ) == "LVM2" )
+	{
+		temp = _( "Logical Volume Management is not yet supported." ) ;
+		temp += "\n" ;
+		partition_temp .messages .push_back( temp ) ;
+		return GParted::FS_LVM2 ;
+	}
 
 	//no file system found....
 	temp = _( "Unable to detect file system! Possible reasons are:" ) ;
@@ -2599,7 +2624,9 @@
 		case FS_HFS		: p_filesystem = new hfs() ; 		break ;
 		case FS_HFSPLUS		: p_filesystem = new hfsplus() ; 	break ;
 		case FS_UFS		: p_filesystem = new ufs() ;	 	break ;
-
+#ifdef BTRFS_SUPPORT
+		case FS_BTRFS		: p_filesystem = new btrfs() ;	 	break ;
+#endif
 		default			: p_filesystem = NULL ;
 	}
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-12-15 12:06:03 +0000
+++ src/Makefile.am	2010-07-14 16:03:42 +0000
@@ -7,6 +7,10 @@
 
 AM_CXXFLAGS = -Wall	
 
+if BTRFS_SUPPORT
+btrfs_source = btrfs.cc
+endif
+
 sbin_PROGRAMS = gpartedbin
 
 gpartedbin_SOURCES = \
@@ -57,7 +61,8 @@
 	reiser4.cc 			\
 	reiserfs.cc			\
 	ufs.cc				\
-	xfs.cc
+	xfs.cc				\
+	$(btrfs_source)			
 	
 gpartedbin_LDFLAGS = -lparted -lgthread-2.0 
 

=== modified file 'src/Utils.cc'
--- src/Utils.cc	2010-03-14 12:54:22 +0000
+++ src/Utils.cc	2010-07-14 16:03:42 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "../include/Utils.h"
+#include "../config.h"
 
 #include <sstream>
 #include <iomanip>
@@ -161,6 +162,9 @@
 		case FS_REISER4     : return "reiser4progs" ;
 		case FS_REISERFS    : return "reiserfsprogs" ;
 		case FS_UFS         : return "" ;
+#ifdef BTRFS_SUPPORT
+		case FS_BTRFS       : return "btrfs-tools" ;
+#endif
 		case FS_XFS         : return "xfsprogs" ;
 
 		default             : return "" ;