From: Tom Clegg <tom@curii.com>
Date: Mon, 11 Jul 2022 01:26:14 +0000 (-0400)
Subject: 17344: Tidy systemd / fpm integration.
X-Git-Tag: 2.5.0~115^2~28
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/926a731c492726b2590993765f1b3d383e557fa5

17344: Tidy systemd / fpm integration.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/cmd/arvados-package/fpm.go b/cmd/arvados-package/fpm.go
index 9a20ec76fc..c58450d86a 100644
--- a/cmd/arvados-package/fpm.go
+++ b/cmd/arvados-package/fpm.go
@@ -97,11 +97,10 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
 		"--verbose",
 		"--deb-use-file-permissions",
 		"--rpm-use-file-permissions",
-		"--deb-systemd", "/etc/systemd/system/multi-user.target.wants/arvados.service",
+		"--deb-systemd", "/lib/systemd/system/arvados.service",
 		"--deb-systemd-enable",
 		"--no-deb-systemd-auto-start",
 		"--no-deb-systemd-restart-after-upgrade",
-		"/lib/systemd/system/arvados.service",
 		"/usr/bin/arvados-client",
 		"/usr/bin/arvados-server",
 		"/usr/bin/arv",