From b99809d3d2d6b7a1643d14f5704bfe92c9db14a3 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Sun, 7 Jun 2020 18:08:25 +0900 Subject: [PATCH] dist/debian: don't install systemd unit by install.sh, use debian/*.service Installing *.service by install.sh script causes the error on installing .deb package, use debian/*.service instead. Fixes scylladb/scylla#6010 Related scylladb/scylla#5640 Related https://github.com/scylladb/scylla/commit/29285b28e2de2f07593a65a5f03977da440b2e42 (cherry picked from commit 2883a8dc63dca9944032143fb79ec3ae09a68ac1) --- dist/debian/debian/scylla-jmx.install | 4 ++++ dist/debian/rules.mustache | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 dist/debian/debian/scylla-jmx.install diff --git a/dist/debian/debian/scylla-jmx.install b/dist/debian/debian/scylla-jmx.install new file mode 100644 index 0000000..178f78e --- /dev/null +++ b/dist/debian/debian/scylla-jmx.install @@ -0,0 +1,4 @@ +etc/default/scylla-jmx +etc/systemd/system/scylla-jmx.service.d/sysconfdir.conf +opt/scylladb/jmx/* +usr/lib/scylla/jmx/* diff --git a/dist/debian/rules.mustache b/dist/debian/rules.mustache index a6030f6..9a1494f 100755 --- a/dist/debian/rules.mustache +++ b/dist/debian/rules.mustache @@ -6,7 +6,7 @@ override_dh_auto_clean: override_dh_auto_install: dh_auto_install - ./install.sh --root "$(CURDIR)/debian/{{product}}-jmx" --sysconfdir /etc/default + ./install.sh --root "$(CURDIR)/debian/tmp" --sysconfdir /etc/default override_dh_installinit: {{#scylla}}