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 29285b28e2
This commit is contained in:
Takuya ASADA 2020-06-07 18:08:25 +09:00
parent 3fb777a8f0
commit 8b7ee3c679
2 changed files with 10 additions and 2 deletions

View File

@ -8,7 +8,7 @@ override_dh_auto_clean:
override_dh_auto_install:
dh_auto_install
cd scylla-jmx; ./install.sh --root "$(CURDIR)/debian/$(DEB_SOURCE)" --sysconfdir /etc/default
cd scylla-jmx; ./install.sh --root "$(CURDIR)/debian/$(DEB_SOURCE)" --sysconfdir /etc/default --skip-service
override_dh_installinit:
ifeq ($(DEB_SOURCE),scylla-jmx)

View File

@ -31,6 +31,7 @@ Options:
--prefix /prefix directory prefix (default /usr)
--nonroot shortcut of '--disttype nonroot'
--sysconfdir /etc/sysconfig specify sysconfig directory name
--skip-service skip installing systemd .service files
--help this helpful message
EOF
exit 1
@ -39,6 +40,7 @@ EOF
root=/
sysconfdir=/etc/sysconfig
nonroot=false
skip_service=false
while [ $# -gt 0 ]; do
case "$1" in
@ -58,6 +60,10 @@ while [ $# -gt 0 ]; do
sysconfdir="$2"
shift 2
;;
"--skip-service")
skip_service=true
shift 1
;;
"--help")
shift 1
print_usage
@ -93,7 +99,9 @@ install -d -m755 "$rsystemd"
install -d -m755 "$rprefix/scripts" "$rprefix/jmx" "$rprefix/jmx/symlinks"
install -m644 dist/common/sysconfig/scylla-jmx -Dt "$rsysconfdir"
install -m644 dist/common/systemd/scylla-jmx.service -Dt "$rsystemd"
if ! $skip_service; then
install -m644 dist/common/systemd/scylla-jmx.service -Dt "$rsystemd"
fi
if ! $nonroot; then
if [ "$sysconfdir" != "/etc/sysconfig" ]; then
install -d -m755 "$retc"/systemd/system/scylla-jmx.service.d