From: Jonathan McDowell <noodles@earth.li>
Date: Sat, 26 Nov 2022 16:50:03 +0000 (+0000)
Subject: Fix /run/onak creation
X-Git-Tag: onak-0.6.2~4
X-Git-Url: https://the.earth.li/gitweb/?a=commitdiff_plain;h=79d3367860d989851c6842fce70601420439ab5c;p=onak.git

Fix /run/onak creation

The keyd socket was previously moved under /run/onak so that
subdirectory could be owned by the onak user. However the systemd
ExecStartPre commands run as the onak user, so the creation + ownership
setup was not properly happening. Prefix with a +, which tells systemd
these commands ignore the User= setting.
---

diff --git a/debian/onak.service b/debian/onak.service
index c3ad674..60ba20c 100644
--- a/debian/onak.service
+++ b/debian/onak.service
@@ -4,8 +4,8 @@ Documentation=man:keyd
 
 [Service]
 User=onak
-ExecStartPre=/bin/mkdir -m 0755 /run/onak
-ExecStartPre=/bin/chown onak /run/onak
+ExecStartPre=+/bin/mkdir -p -m 0755 /run/onak
+ExecStartPre=+/bin/chown onak /run/onak
 ExecStart=/usr/sbin/keyd -f
 ExecStop=/usr/bin/keydctl quit