From aab57f35bccad4b39cf90402864b16db7742279d Mon Sep 17 00:00:00 2001 From: Claudio Fleiner Date: Fri, 5 Dec 2014 15:11:28 -0800 Subject: [PATCH 1/2] rpmify Change-Id: Iffa28034d4228366565c762b4103fae2a54b2518 --- Makefile.am | 3 +++ bcache-tools.spec | 3 ++- configure.ac | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fdfe1a53..07aff1dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,3 +42,6 @@ initramfsdir=$(prefix)/etc/initramfs-tools/hooks/ man8_MANS= bcache-super-show.8 \ make-bcache.8 \ probe-bcache.8 + +include ../../../../../../../../../../usr/share/DateraContainer/Makefile.rpm +# some version of automake don't like absolute path names for included makefiles diff --git a/bcache-tools.spec b/bcache-tools.spec index 9b04d8b9..d3e877c9 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -8,9 +8,10 @@ Group: tools BuildRoot: %{_tmppath}/%{name}-root Requires: libblkid BuildRequires: pkgconfig libblkid-devel linux-headers +Summary: tools to manage bcache -%package dev %description +bcache tools %files diff --git a/configure.ac b/configure.ac index a8039c00..bd0decda 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(bcache-tools, VERSION, BUG-REPORT-ADDRESS) +AC_INIT(bcache-tools, 0.1, support@datera.io) AM_INIT_AUTOMAKE LT_INIT AC_CONFIG_HEADER([config.h]) From 6145b37851ef58d9bc8b7b8b1cb7d41472cff107 Mon Sep 17 00:00:00 2001 From: Raghu Krishnamurthy Date: Mon, 8 Dec 2014 19:23:39 -0800 Subject: [PATCH 2/2] Set the label field in the cache set superblock if label is specified. Change-Id: Ic1b2d45c9544acfbabd8ee99cfe59c4ae6fb4183 --- bcacheadm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bcacheadm.c b/bcacheadm.c index 913fcefd..7ff4eea0 100644 --- a/bcacheadm.c +++ b/bcacheadm.c @@ -255,6 +255,9 @@ int make_bcache(NihCommand *command, char *const *args) uuid_generate(cache_set_sb->set_uuid.b); } + if (label) + memcpy(cache_set_sb->label, label, sizeof(cache_set_sb->label)); + if (csum_type) { SET_CACHE_PREFERRED_CSUM_TYPE(cache_set_sb, read_string_list_or_die(csum_type, csum_types,