Source: tarantool
Version: 2.6.0-1.2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

We want to modify dh_systemd_enable such that it installs units below
/usr in order to finalize the /usr-merge transition via DEP17. When
doing so, tarantool.service will be duplicated to /lib (via dh_install)
and /usr/lib (via dh_systemd_enable). I tried installing all units with
debhelper only, but I wasn't successful. Therefore, I propose doing the
reverse: installing units via dh_install only. Hence dh_systemd_enable
is not involved in unit placement and when it flips to /usr, tarantool
will continue to install to /lib. It'll need another patch, but at
least, it won't cause a policy violation and become rc buggy when I
upload debhelper.

Helmut
diff -Nru tarantool-2.6.0/debian/changelog tarantool-2.6.0/debian/changelog
--- tarantool-2.6.0/debian/changelog    2022-10-15 12:51:17.000000000 +0200
+++ tarantool-2.6.0/debian/changelog    2023-10-24 15:11:46.000000000 +0200
@@ -1,3 +1,10 @@
+tarantool (2.6.0-1.3) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install systemd units only once. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 24 Oct 2023 15:11:46 +0200
+
 tarantool (2.6.0-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru tarantool-2.6.0/debian/rules tarantool-2.6.0/debian/rules
--- tarantool-2.6.0/debian/rules        2022-09-12 07:51:23.000000000 +0200
+++ tarantool-2.6.0/debian/rules        2023-10-24 14:58:58.000000000 +0200
@@ -26,7 +26,7 @@
 # install it within tarantool and tarantool-dev packages.
 DEB_DH_INSTALLINIT_ARGS                     := --name=tarantool
 DEB_DH_SYSTEMD_ENABLE_ARGS_tarantool        := --name=tarantool
-DEB_DH_SYSTEMD_ENABLE_ARGS_tarantool-common := --name=tarantool 
tarantool.service
+DEB_DH_SYSTEMD_ENABLE_ARGS_tarantool-common := --name=tarantool
 DEB_DH_SYSTEMD_START_ARGS_tarantool-common  := --no-restart-on-upgrade 
tarantool.service
 
 # Needed for proper backtraces in fiber.info()
diff -Nru tarantool-2.6.0/debian/tarantool.service 
tarantool-2.6.0/debian/tarantool.service
--- tarantool-2.6.0/debian/tarantool.service    2018-11-15 15:42:54.000000000 
+0100
+++ tarantool-2.6.0/debian/tarantool.service    1970-01-01 01:00:00.000000000 
+0100
@@ -1,15 +0,0 @@
-# systemd service for managing all Tarantool instances on the system. This
-# service is actually a systemd target, but we are using a service since
-# targets cannot be reloaded.
-
-[Unit]
-Description=Tarantool Database Server
-
-[Service]
-Type=oneshot
-ExecStart=/bin/true
-ExecReload=/bin/true
-RemainAfterExit=on
-
-[Install]
-WantedBy=multi-user.target

Reply via email to