diff --git a/Makefile.am b/Makefile.am index 98ff957e..e421b807 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,3 +52,6 @@ man8_MANS= bcache-super-show.8 \ make-bcache.8 \ probe-bcache.8 \ bcacheadm.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 77815c2b..5242ee2f 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 libnih-devel +Summary: tools to manage bcache -%package dev %description +bcache tools %files diff --git a/bcacheadm.c b/bcacheadm.c index b321c980..10ffb3fa 100644 --- a/bcacheadm.c +++ b/bcacheadm.c @@ -269,6 +269,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, diff --git a/configure.ac b/configure.ac index f32ce3df..cf75d352 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])