From ed962b20cb15e169f6c1707d0d3a6b117d279d5a65de5fc21cf0d38a4811a5ea Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 6 Apr 2012 12:13:34 +0000 Subject: [PATCH] remove sles mkfs disclaimer OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=123 --- btrfs-mkfs-update-disclaimer.patch | 28 ---------------------------- btrfsprogs.spec | 1 - 2 files changed, 29 deletions(-) delete mode 100644 btrfs-mkfs-update-disclaimer.patch diff --git a/btrfs-mkfs-update-disclaimer.patch b/btrfs-mkfs-update-disclaimer.patch deleted file mode 100644 index 939a4a0..0000000 --- a/btrfs-mkfs-update-disclaimer.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: btrfs-progs-v0.19-118-gfdb6c04/mkfs.c -=================================================================== ---- btrfs-progs-v0.19-118-gfdb6c04.orig/mkfs.c -+++ btrfs-progs-v0.19-118-gfdb6c04/mkfs.c -@@ -1297,8 +1297,13 @@ int main(int ac, char **av) - if (ac == 0) - print_usage(); - -- printf("\nWARNING! - %s IS EXPERIMENTAL\n", BTRFS_BUILD_VERSION); -- printf("WARNING! - see http://btrfs.wiki.kernel.org before using\n\n"); -+ printf("\n%s\n", BTRFS_BUILD_VERSION); -+ printf("\n\ -+ATTENTION:\n\ -+\n\ -+mkfs.btrfs is not intended to be used directly. Please use the\n\ -+YaST partitioner to create and manage btrfs filesystems to be\n\ -+in a supported state on SUSE Linux Enterprise systems.\n\n"); - - if (source_dir == 0) { - file = av[optind++]; -@@ -1456,7 +1461,6 @@ raid_groups: - pretty_buf = pretty_sizes(btrfs_super_total_bytes(&root->fs_info->super_copy))); - free(pretty_buf); - -- printf("%s\n", BTRFS_BUILD_VERSION); - btrfs_commit_transaction(trans, root); - - if (source_dir_set) { diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 1c5e77e..a42bafb 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -132,7 +132,6 @@ Patch138: 0138-Btrfs-progs-bugfix-for-scrubbing-single-devices.patch # Patch250: btrfs-progs-fix-open_ctree_usage_segfaults.patch -Patch251: btrfs-mkfs-update-disclaimer.patch Patch253: btrfs-reorder-commands-help BuildRoot: %{_tmppath}/%{name}-%{version}-build