From db2f5e6be175f1091cbb1b341ccb4738153070db Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Thu, 13 Oct 2016 14:10:27 +0300
Subject: [PATCH] blocktune: wire up blocktune on startup

Message-Id: <1476357027-15014-3-git-send-email-avi@scylladb.com>
---
 dist/common/scripts/scylla_prepare   | 2 ++
 dist/redhat/scylla.spec.in           | 2 ++
 dist/ubuntu/scylla-server.install.in | 1 +
 3 files changed, 5 insertions(+)

diff --git a/dist/common/scripts/scylla_prepare b/dist/common/scripts/scylla_prepare
index 7af741e267..6690bf3f0c 100755
--- a/dist/common/scripts/scylla_prepare
+++ b/dist/common/scripts/scylla_prepare
@@ -39,3 +39,5 @@ fi
 if [ "$ID" = "ubuntu" ]; then
     hugeadm --create-mounts
 fi
+
+/usr/lib/scylla/scylla-blocktune
diff --git a/dist/redhat/scylla.spec.in b/dist/redhat/scylla.spec.in
index 1ad0174090..58d7755d00 100644
--- a/dist/redhat/scylla.spec.in
+++ b/dist/redhat/scylla.spec.in
@@ -84,6 +84,7 @@ install -m755 seastar/dpdk/tools/dpdk_nic_bind.py $RPM_BUILD_ROOT%{_prefix}/lib/
 install -m755 build/release/scylla $RPM_BUILD_ROOT%{_bindir}
 install -m755 build/release/iotune $RPM_BUILD_ROOT%{_bindir}
 install -m755 dist/common/bin/scyllatop $RPM_BUILD_ROOT%{_bindir}
+install -m755 scylla-blocktune $RPM_BUILD_ROOT%{_prefix}/lib/scylla/
 install -m755 scylla-housekeeping $RPM_BUILD_ROOT%{_prefix}/lib/scylla/
 if @@HOUSEKEEPING_CONF@@; then
     install -m644 conf/housekeeping.cfg $RPM_BUILD_ROOT%{_sysconfdir}/scylla/
@@ -156,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/iotune
 %{_bindir}/scyllatop
 %{_sbindir}/scylla*
+%{_prefix}/lib/scylla/scylla-blocktune
 %{_prefix}/lib/scylla/scylla-housekeeping
 %{_prefix}/lib/scylla/scylla_prepare
 %{_prefix}/lib/scylla/scylla_stop
diff --git a/dist/ubuntu/scylla-server.install.in b/dist/ubuntu/scylla-server.install.in
index 6c2ae320d0..81bd1b6093 100644
--- a/dist/ubuntu/scylla-server.install.in
+++ b/dist/ubuntu/scylla-server.install.in
@@ -6,6 +6,7 @@ seastar/scripts/dpdk_nic_bind.py usr/lib/scylla
 seastar/scripts/posix_net_conf.sh usr/lib/scylla
 dist/common/scripts/* usr/lib/scylla
 dist/ubuntu/scripts/* usr/lib/scylla
+scylla-blocktune usr/lib/scylla
 scylla-housekeeping usr/lib/scylla
 tools/scyllatop usr/lib/scylla
 swagger-ui/dist usr/lib/scylla/swagger-ui