From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65BD2158041 for ; Wed, 8 Sep 2021 23:42:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85663E0874; Wed, 8 Sep 2021 23:42:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE452E0874 for ; Wed, 8 Sep 2021 23:42:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32268342AB4 for ; Wed, 8 Sep 2021 23:42:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 774B355 for ; Wed, 8 Sep 2021 23:42:24 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <1631144413.98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9.mschiff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/bareos/files/bareos-dir.service app-backup/bareos/files/bareos-sd.service X-VCS-Directories: app-backup/bareos/files/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: 98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9 X-VCS-Branch: master Date: Wed, 8 Sep 2021 23:42:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c83b28e0-4e36-4383-9ba0-3b598d1f8c8d X-Archives-Hash: a9d40807fc39106d260a849c4d568f4b commit: 98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9 Author: Marc Schiffbauer gentoo org> AuthorDate: Wed Sep 8 23:18:52 2021 +0000 Commit: Marc Schiffbauer gentoo org> CommitDate: Wed Sep 8 23:40:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98caaa05 app-backup/bareos: systemd workaround for #631598 When using systemd. sd and dir services should not depend on the PID files, so we use bareos-sd and bareos-dir as foreground services for which systemd does not need PID files Signed-off-by: Marc Schiffbauer gentoo.org> app-backup/bareos/files/bareos-dir.service | 9 ++++++--- app-backup/bareos/files/bareos-sd.service | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app-backup/bareos/files/bareos-dir.service b/app-backup/bareos/files/bareos-dir.service index a342671d0d0..f0a61171548 100644 --- a/app-backup/bareos/files/bareos-dir.service +++ b/app-backup/bareos/files/bareos-dir.service @@ -11,14 +11,17 @@ After=nss-lookup.target network.target remote-fs.target time-sync.target postgre ConditionPathIsDirectory=/var/lib/bareos [Service] -Type=forking +# see bug #631598 +#Type=forking +Type=simple User=bareos Group=bareos WorkingDirectory=/var/lib/bareos -PIDFile=/run/bareos/bareos-dir.9101.pid +#PIDFile=/run/bareos/bareos-dir.9101.pid StandardError=journal ExecStartPre=/usr/sbin/bareos-dir -t -f -ExecStart=/usr/sbin/bareos-dir +#ExecStart=/usr/sbin/bareos-dir +ExecStart=/usr/sbin/bareos-dir -f SuccessExitStatus=0 1 15 #Restart=on-failure diff --git a/app-backup/bareos/files/bareos-sd.service b/app-backup/bareos/files/bareos-sd.service index 80d9edbc973..acf8cb0156e 100644 --- a/app-backup/bareos/files/bareos-sd.service +++ b/app-backup/bareos/files/bareos-sd.service @@ -10,14 +10,17 @@ Requires=nss-lookup.target network.target remote-fs.target time-sync.target After=nss-lookup.target network.target remote-fs.target time-sync.target [Service] -Type=forking +# see bug #631598 +#Type=forking +Type=simple User=root Group=bareos WorkingDirectory=/var/lib/bareos -PIDFile=/run/bareos/bareos-sd.9103.pid +#PIDFile=/run/bareos/bareos-sd.9103.pid StandardError=journal ExecStartPre=/usr/sbin/bareos-sd -t -f -ExecStart=/usr/sbin/bareos-sd +#ExecStart=/usr/sbin/bareos-sd +ExecStart=/usr/sbin/bareos-sd -f # enable this for scsicrypto-sd # CapabilityBoundingSet=cap_sys_rawio+ep SuccessExitStatus=0 15