From 2a45a0e72da714c049d4f4d57fba543763f6c1d5 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@fedoraproject.org>
Date: Jan 22 2009 19:42:15 +0000
Subject: add'ing patch to allow /'s in labels so you can actuall install onto btrfs


---

diff --git a/btrfs-progs-fix-labels.patch b/btrfs-progs-fix-labels.patch
new file mode 100644
index 0000000..29fdbb5
--- /dev/null
+++ b/btrfs-progs-fix-labels.patch
@@ -0,0 +1,17 @@
+diff --git a/mkfs.c b/mkfs.c
+index d664254..5ed44cc 100644
+--- a/mkfs.c
++++ b/mkfs.c
+@@ -302,12 +302,6 @@ static char *parse_label(char *input)
+ 			BTRFS_LABEL_SIZE);
+ 		exit(1);
+ 	}
+-	for (i = 0; i < len; i++) {
+-		if (input[i] == '/' || input[i] == '\\') {
+-			fprintf(stderr, "invalid label %s\n", input);
+-			exit(1);
+-		}
+-	}
+ 	return strdup(input);
+ }
+ 
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 8b3baa3..e5d7d27 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,12 +1,13 @@
 Name:           btrfs-progs
 Version:        0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
+Patch0: btrfs-progs-fix-labels.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel, zlib-devel, libacl-devel
@@ -19,6 +20,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Thu Jan 22 2009 Josef Bacik <josef@toxicpanda.com> 0.18-2
+- add a patch to handle having /'s in labels
+
 * Sat Jan 17 2009 Josef Bacik <josef@toxicpanda.com> 0.18-1
 - updated to 0.18 because of the ioctl change in 2.6.29-rc2