rpms/btrfs-progs/devel btrfs-progs-fix-labels.patch, NONE, 1.1 btrfs-progs.spec, 1.9, 1.10

[Josef Bacik]

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15643

Modified Files:
	btrfs-progs.spec 
Added Files:
	btrfs-progs-fix-labels.patch 
Log Message:
add'ing patch to allow /'s in labels so you can actuall install onto btrfs


btrfs-progs-fix-labels.patch:

--- NEW FILE btrfs-progs-fix-labels.patch ---
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);
 }
 


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- btrfs-progs.spec	17 Jan 2009 13:55:44 -0000	1.9
+++ btrfs-progs.spec	22 Jan 2009 19:42:15 -0000	1.10
@@ -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 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -45,6 +47,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Thu Jan 22 2009 Josef Bacik <josef at toxicpanda.com> 0.18-2
+- add a patch to handle having /'s in labels
+
 * Sat Jan 17 2009 Josef Bacik <josef at toxicpanda.com> 0.18-1
 - updated to 0.18 because of the ioctl change in 2.6.29-rc2