alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gits.daterainc.com:2984/project/2013.MAIN/bcache-tools

Browse Source
This commit is contained in:
jenkins 2014-12-13 05:04:36 -08:00
commit 4c7c1f088e
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -52,3 +52,6 @@ man8_MANS= bcache-super-show.8 \
make-bcache.8 \ make-bcache.8 \
probe-bcache.8 \ probe-bcache.8 \
bcacheadm.8 bcacheadm.8
include ../../../../../../../../../../usr/share/DateraContainer/Makefile.rpm
# some version of automake don't like absolute path names for included makefiles

3
bcache-tools.spec
View File

@ -8,9 +8,10 @@ Group: tools
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
Requires: libblkid Requires: libblkid
BuildRequires: pkgconfig libblkid-devel linux-headers libnih-devel BuildRequires: pkgconfig libblkid-devel linux-headers libnih-devel
Summary: tools to manage bcache
%package dev
%description %description
bcache tools
%files %files

3
bcacheadm.c
View File

@ -269,6 +269,9 @@ int make_bcache(NihCommand *command, char *const *args)
uuid_generate(cache_set_sb->set_uuid.b); uuid_generate(cache_set_sb->set_uuid.b);
} }
if (label)
memcpy(cache_set_sb->label, label, sizeof(cache_set_sb->label));
if (csum_type) { if (csum_type) {
SET_CACHE_PREFERRED_CSUM_TYPE(cache_set_sb, SET_CACHE_PREFERRED_CSUM_TYPE(cache_set_sb,
read_string_list_or_die(csum_type, csum_types, read_string_list_or_die(csum_type, csum_types,

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT(bcache-tools, VERSION, BUG-REPORT-ADDRESS) AC_INIT(bcache-tools, 0.1, support@datera.io)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
LT_INIT LT_INIT
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])