Skip to content

Commit 51bb953

Browse files
author
Justin Spencer
committed
Write PIDFile inside /var/run/usbguard directory
1 parent 03f40c2 commit 51bb953

9 files changed

+10
-10
lines changed

src/Daemon/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#endif
4040

4141
#ifndef USBGUARD_PID_FILE
42-
#define USBGUARD_PID_FILE "/var/run/usbguard.pid"
42+
#define USBGUARD_PID_FILE "/var/run/usbguard/usbguard.pid"
4343
#endif
4444

4545
using namespace usbguard;

src/Tests/LDAP/Sanity/ldap-nsswitch.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
9191

9292
COUNTER="0"
9393
declare -A BAD
94-
PIDFILE="/var/run/usbguard.pid"
94+
PIDFILE="/var/run/usbguard/usbguard.pid"
9595

9696
function grep_and_fail ()
9797
{

src/Tests/LDAP/UseCase/ldap-test-1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
8989

9090
sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
9191

92-
PIDFILE="/var/run/usbguard.pid"
92+
PIDFILE="/var/run/usbguard/usbguard.pid"
9393

9494
${LDAP_UTIL} delete && true
9595
${LDAP_UTIL} setup

src/Tests/LDAP/UseCase/ldap-test-2.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
8989

9090
sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
9191

92-
PIDFILE="/var/run/usbguard.pid"
92+
PIDFILE="/var/run/usbguard/usbguard.pid"
9393

9494
${LDAP_UTIL} delete && true
9595
${LDAP_UTIL} setup

src/Tests/LDAP/UseCase/ldap-test-3.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
8989

9090
sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
9191

92-
PIDFILE="/var/run/usbguard.pid"
92+
PIDFILE="/var/run/usbguard/usbguard.pid"
9393

9494
${LDAP_UTIL} delete && true
9595
# ${LDAP_UTIL} setup

src/Tests/LDAP/UseCase/ldap-test-4.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
8989

9090
sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
9191

92-
PIDFILE="/var/run/usbguard.pid"
92+
PIDFILE="/var/run/usbguard/usbguard.pid"
9393

9494
# ${LDAP_UTIL} delete && true
9595
# ${LDAP_UTIL} setup

src/Tests/LDAP/UseCase/ldap-test-5.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ sudo -n cat "$ldap_path"
141141

142142
sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
143143

144-
PIDFILE="/var/run/usbguard.pid"
144+
PIDFILE="/var/run/usbguard/usbguard.pid"
145145

146146
${LDAP_UTIL} delete && true
147147
${LDAP_UTIL} setup

src/Tests/UseCase/004_daemonize.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source "${USBGUARD_TESTLIB_BASH}" || exit 129
2626
export USBGUARD_TESTLIB_TMPDIR="$(mktemp -d --tmpdir usbguard-test.XXXXXX)"
2727

2828
export config_path="${USBGUARD_TESTLIB_TMPDIR}/daemon.conf"
29-
export pidfile_path="${USBGUARD_TESTLIB_TMPDIR}/usbguard.pid"
29+
export pidfile_path="${USBGUARD_TESTLIB_TMPDIR}/usbguard/usbguard.pid"
3030
export logfile="${USBGUARD_TESTLIB_TMPDIR}/daemon.log"
3131

3232
function test_cli_daemonize()

usbguard.service.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ IPAddressDeny=any
1212
LockPersonality=yes
1313
MemoryDenyWriteExecute=yes
1414
NoNewPrivileges=yes
15-
PIDFile=/run/usbguard.pid
15+
PIDFile=/run/usbguard/usbguard.pid
1616
PrivateDevices=yes
1717
PrivateTmp=yes
1818
ProtectControlGroups=yes
1919
ProtectHome=yes
2020
ProtectKernelModules=yes
2121
ProtectSystem=yes
2222
ReadOnlyPaths=-/
23-
ReadWritePaths=-/dev/shm -%localstatedir%/log/usbguard -/tmp -%sysconfdir%/usbguard/ -/var/run
23+
ReadWritePaths=-/dev/shm -%localstatedir%/log/usbguard -/tmp -%sysconfdir%/usbguard/ -/var/run/usbguard
2424
Restart=on-failure
2525
RestrictAddressFamilies=AF_UNIX AF_NETLINK
2626
RestrictNamespaces=yes

0 commit comments

Comments
 (0)