| 1 |
commit: 98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9 |
| 2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 8 23:18:52 2021 +0000 |
| 4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 23:40:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98caaa05 |
| 7 |
|
| 8 |
app-backup/bareos: systemd workaround for #631598 |
| 9 |
|
| 10 |
When using systemd. sd and dir services should not |
| 11 |
depend on the PID files, so we use bareos-sd and bareos-dir as |
| 12 |
foreground services for which systemd does not need PID files |
| 13 |
|
| 14 |
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org> |
| 15 |
|
| 16 |
app-backup/bareos/files/bareos-dir.service | 9 ++++++--- |
| 17 |
app-backup/bareos/files/bareos-sd.service | 9 ++++++--- |
| 18 |
2 files changed, 12 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-backup/bareos/files/bareos-dir.service b/app-backup/bareos/files/bareos-dir.service |
| 21 |
index a342671d0d0..f0a61171548 100644 |
| 22 |
--- a/app-backup/bareos/files/bareos-dir.service |
| 23 |
+++ b/app-backup/bareos/files/bareos-dir.service |
| 24 |
@@ -11,14 +11,17 @@ After=nss-lookup.target network.target remote-fs.target time-sync.target postgre |
| 25 |
ConditionPathIsDirectory=/var/lib/bareos |
| 26 |
|
| 27 |
[Service] |
| 28 |
-Type=forking |
| 29 |
+# see bug #631598 |
| 30 |
+#Type=forking |
| 31 |
+Type=simple |
| 32 |
User=bareos |
| 33 |
Group=bareos |
| 34 |
WorkingDirectory=/var/lib/bareos |
| 35 |
-PIDFile=/run/bareos/bareos-dir.9101.pid |
| 36 |
+#PIDFile=/run/bareos/bareos-dir.9101.pid |
| 37 |
StandardError=journal |
| 38 |
ExecStartPre=/usr/sbin/bareos-dir -t -f |
| 39 |
-ExecStart=/usr/sbin/bareos-dir |
| 40 |
+#ExecStart=/usr/sbin/bareos-dir |
| 41 |
+ExecStart=/usr/sbin/bareos-dir -f |
| 42 |
SuccessExitStatus=0 1 15 |
| 43 |
#Restart=on-failure |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/app-backup/bareos/files/bareos-sd.service b/app-backup/bareos/files/bareos-sd.service |
| 47 |
index 80d9edbc973..acf8cb0156e 100644 |
| 48 |
--- a/app-backup/bareos/files/bareos-sd.service |
| 49 |
+++ b/app-backup/bareos/files/bareos-sd.service |
| 50 |
@@ -10,14 +10,17 @@ Requires=nss-lookup.target network.target remote-fs.target time-sync.target |
| 51 |
After=nss-lookup.target network.target remote-fs.target time-sync.target |
| 52 |
|
| 53 |
[Service] |
| 54 |
-Type=forking |
| 55 |
+# see bug #631598 |
| 56 |
+#Type=forking |
| 57 |
+Type=simple |
| 58 |
User=root |
| 59 |
Group=bareos |
| 60 |
WorkingDirectory=/var/lib/bareos |
| 61 |
-PIDFile=/run/bareos/bareos-sd.9103.pid |
| 62 |
+#PIDFile=/run/bareos/bareos-sd.9103.pid |
| 63 |
StandardError=journal |
| 64 |
ExecStartPre=/usr/sbin/bareos-sd -t -f |
| 65 |
-ExecStart=/usr/sbin/bareos-sd |
| 66 |
+#ExecStart=/usr/sbin/bareos-sd |
| 67 |
+ExecStart=/usr/sbin/bareos-sd -f |
| 68 |
# enable this for scsicrypto-sd |
| 69 |
# CapabilityBoundingSet=cap_sys_rawio+ep |
| 70 |
SuccessExitStatus=0 15 |
Archives