diff options
Diffstat (limited to 'app-backup/bareos/files/bareos-dir-21.initd')
| -rw-r--r-- | app-backup/bareos/files/bareos-dir-21.initd | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/app-backup/bareos/files/bareos-dir-21.initd b/app-backup/bareos/files/bareos-dir-21.initd index 7100b615105c..916ee13b36ce 100644 --- a/app-backup/bareos/files/bareos-dir-21.initd +++ b/app-backup/bareos/files/bareos-dir-21.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { @@ -9,23 +9,14 @@ depend() { start() { ebegin "Starting bareos director" - # g+w until #631598 is resolved - checkpath -d -m 0770 -o root:bareos /run/bareos + checkpath -d -m 0750 -o root:bareos /run/bareos start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \ - -- ${DIR_OPTIONS} - # harden pid file until #631598 is resolved - ewaitfile 10 /run/bareos/bareos-dir.9101.pid - chown root:bareos /run/bareos/bareos-dir.9101.pid + -- -p /run/bareos/bareos-dir.9101.pid ${DIR_OPTIONS} eend $? } stop() { ebegin "Stopping bareos director" - # check pid file until #631598 is resolved - if [[ $(stat -c %U /run/bareos/bareos-dir.9101.pid) != "root" ]]; then - eerror "SECURITY ALERT: pid file is not root owned anymore?! (see #631598)" - else - start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.9101.pid - fi + start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.9101.pid eend $? } |