Commit 52b4ecc Justin Spencer
committed
1 parent 03f40c2 commit 52b4ecc Copy full SHA for 52b4ecc
File tree 9 files changed +11
-10
lines changed
9 files changed +11
-10
lines changed Original file line number Diff line number Diff line change 39
39
#endif
40
40
41
41
#ifndef USBGUARD_PID_FILE
42
- #define USBGUARD_PID_FILE " /var/run/usbguard.pid"
42
+ #define USBGUARD_PID_FILE " /var/run/usbguard/usbguard .pid"
43
43
#endif
44
44
45
45
using namespace usbguard ;
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ sudo -n cp "$ldap_path" /etc/usbguard/usbguard-ldap.conf
91
91
92
92
COUNTER=" 0"
93
93
declare -A BAD
94
- PIDFILE=" /var/run/usbguard.pid"
94
+ PIDFILE=" /var/run/usbguard/usbguard .pid"
95
95
96
96
function grep_and_fail ()
97
97
{
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
89
89
90
90
sudo -n cp " $ldap_path " /etc/usbguard/usbguard-ldap.conf
91
91
92
- PIDFILE=" /var/run/usbguard.pid"
92
+ PIDFILE=" /var/run/usbguard/usbguard .pid"
93
93
94
94
${LDAP_UTIL} delete && true
95
95
${LDAP_UTIL} setup
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
89
89
90
90
sudo -n cp " $ldap_path " /etc/usbguard/usbguard-ldap.conf
91
91
92
- PIDFILE=" /var/run/usbguard.pid"
92
+ PIDFILE=" /var/run/usbguard/usbguard .pid"
93
93
94
94
${LDAP_UTIL} delete && true
95
95
${LDAP_UTIL} setup
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
89
89
90
90
sudo -n cp " $ldap_path " /etc/usbguard/usbguard-ldap.conf
91
91
92
- PIDFILE=" /var/run/usbguard.pid"
92
+ PIDFILE=" /var/run/usbguard/usbguard .pid"
93
93
94
94
${LDAP_UTIL} delete && true
95
95
# ${LDAP_UTIL} setup
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ sudo -n cat "$ldap_path"
89
89
90
90
sudo -n cp " $ldap_path " /etc/usbguard/usbguard-ldap.conf
91
91
92
- PIDFILE=" /var/run/usbguard.pid"
92
+ PIDFILE=" /var/run/usbguard/usbguard .pid"
93
93
94
94
# ${LDAP_UTIL} delete && true
95
95
# ${LDAP_UTIL} setup
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ sudo -n cat "$ldap_path"
141
141
142
142
sudo -n cp " $ldap_path " /etc/usbguard/usbguard-ldap.conf
143
143
144
- PIDFILE=" /var/run/usbguard.pid"
144
+ PIDFILE=" /var/run/usbguard/usbguard .pid"
145
145
146
146
${LDAP_UTIL} delete && true
147
147
${LDAP_UTIL} setup
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ source "${USBGUARD_TESTLIB_BASH}" || exit 129
26
26
export USBGUARD_TESTLIB_TMPDIR=" $( mktemp -d --tmpdir usbguard-test.XXXXXX) "
27
27
28
28
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"
30
30
export logfile=" ${USBGUARD_TESTLIB_TMPDIR} /daemon.log"
31
31
32
32
function test_cli_daemonize()
Original file line number Diff line number Diff line change @@ -12,19 +12,20 @@ IPAddressDeny=any
12
12
LockPersonality=yes
13
13
MemoryDenyWriteExecute=yes
14
14
NoNewPrivileges=yes
15
- PIDFile=/run/usbguard.pid
15
+ PIDFile=/run/usbguard/usbguard .pid
16
16
PrivateDevices=yes
17
17
PrivateTmp=yes
18
18
ProtectControlGroups=yes
19
19
ProtectHome=yes
20
20
ProtectKernelModules=yes
21
21
ProtectSystem=yes
22
22
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
24
24
Restart=on-failure
25
25
RestrictAddressFamilies=AF_UNIX AF_NETLINK
26
26
RestrictNamespaces=yes
27
27
RestrictRealtime=yes
28
+ RuntimeDirectory=usbguard
28
29
SystemCallArchitectures=native
29
30
SystemCallFilter=@system-service
30
31
Type=forking
You can’t perform that action at this time.
0 commit comments