From 4a7e623df65e1ddf3552cdb97bbbcaef450872dd Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 12 Jul 2022 09:32:24 -0400 Subject: [PATCH] 17344: Note "systemd enable" step is irrelevant in pkg case. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/install/deps.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/install/deps.go b/lib/install/deps.go index fb2de8a72d..a9fb874e2d 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -677,17 +677,20 @@ rsync -a --delete-after build/ /var/lib/arvados/workbench2/ if err != nil { return 1 } - // This is equivalent to "systemd enable", but does - // not depend on the systemctl program being - // available. - symlink := "/etc/systemd/system/multi-user.target.wants/arvados.service" - err = os.Remove(symlink) - if err != nil && !errors.Is(err, os.ErrNotExist) { - return 1 - } - err = os.Symlink("/lib/systemd/system/arvados.service", symlink) - if err != nil { - return 1 + if prod { + // (fpm will do this for us in the pkg case) + // This is equivalent to "systemd enable", but + // does not depend on the systemctl program + // being available: + symlink := "/etc/systemd/system/multi-user.target.wants/arvados.service" + err = os.Remove(symlink) + if err != nil && !errors.Is(err, os.ErrNotExist) { + return 1 + } + err = os.Symlink("/lib/systemd/system/arvados.service", symlink) + if err != nil { + return 1 + } } // Symlink user-facing programs /usr/bin/x -> -- 2.30.2