build: Fix issue with incorrect ReadWritePaths in unit files

This commit is contained in:
Marcel Holtmann 2019-08-03 09:52:28 +02:00
parent a8faa23de6
commit 16c489490c
4 changed files with 17 additions and 3 deletions

View File

@ -568,8 +568,10 @@ ell/ell.h: Makefile
echo "#include <$$f>" >> $@ ; \
done
SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
-e 's,@libexecdir\@,$(libexecdir),g' \
-e 's,@daemon_storagedir\@,$(daemon_storagedir),g' \
-e 's,@wired_storagedir\@,$(wired_storagedir),g' \
< $< > $@
%.service: %.service.in Makefile

View File

@ -116,6 +116,9 @@ else
wired_storagedir="${localstatedir}/lib/ead"
fi
AC_SUBST([daemon_storagedir], [${daemon_storagedir}])
AC_SUBST([wired_storagedir], [${wired_storagedir}])
AC_DEFINE_UNQUOTED(DAEMON_STORAGEDIR, "${daemon_storagedir}",
[Directory for Wireless daemon storage files])
AC_DEFINE_UNQUOTED(DAEMON_CONFIGDIR, "/etc/iwd",

View File

@ -15,7 +15,7 @@ DevicePolicy=closed
DeviceAllow=/dev/rfkill rw
ProtectHome=yes
ProtectSystem=strict
ReadWritePaths=/var/lib/iwd/
ReadWritePaths=@daemon_storagedir@
ProtectControlGroups=yes
ProtectKernelModules=yes

View File

@ -8,6 +8,15 @@ Type=dbus
BusName=net.connman.ead
ExecStart=@libexecdir@/ead
LimitNPROC=1
Restart=on-failure
PrivateTmp=true
NoNewPrivileges=true
PrivateDevices=true
ProtectHome=yes
ProtectSystem=strict
ReadWritePaths=@wired_storagedir@
ProtectControlGroups=yes
ProtectKernelModules=yes
[Install]
WantedBy=multi-user.target