From 7b92c3fd3f1747a5935bc7b4a4079d620e1df7ea Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Mon, 23 Apr 2018 19:20:41 +0900 Subject: [PATCH] dist: Drop AmbientCapabilities from scylla-server.service for Debian 8 Debian 8 causes "Invalid argument" when we used AmbientCapabilities on systemd unit file, so drop the line when we build .deb package for Debian 8. For other distributions, keep using the feature. Fixes #3344 Signed-off-by: Takuya ASADA Message-Id: <20180423102041.2138-1-syuu@scylladb.com> --- dist/debian/build_deb.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index e44782766a..ff901d3c07 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -235,6 +235,9 @@ fi if [ "$TARGET" != "trusty" ]; then cp dist/common/systemd/scylla-server.service.in debian/scylla-server.service sed -i -e "s#@@SYSCONFDIR@@#/etc/default#g" debian/scylla-server.service + if [ "$TARGET" = "jessie" ]; then + sed -i -e "s#AmbientCapabilities=CAP_SYS_NICE##g" debian/scylla-server.service + fi cp dist/common/systemd/scylla-housekeeping-daily.service.in debian/scylla-server.scylla-housekeeping-daily.service sed -i -e "s#@@REPOFILES@@#'/etc/apt/sources.list.d/scylla*.list'#g" debian/scylla-server.scylla-housekeeping-daily.service cp dist/common/systemd/scylla-housekeeping-restart.service.in debian/scylla-server.scylla-housekeeping-restart.service