Commit 9ed8767c authored by Will Thompson's avatar Will Thompson Committed by Will Thompson

Hardcode storage path as /var/lib/fprint

--localstatedir (and --prefix) will now be ignored in favour of this
hardcoded path.  This is in preparation for a change to use systemd's
StateDirectory feature.
parent 8ae7abc6
......@@ -15,7 +15,7 @@ if HAVE_SYSTEMD
systemdservicedir = $(systemdsystemunitdir)
systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
$(systemdservice_DATA): $(systemdservice_in_files) Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@localstatedir\@|$(localstatedir)|" $< > $@
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
endif
polkitdir = $(datadir)/polkit-1/actions
......
......@@ -11,7 +11,7 @@ ExecStart=@libexecdir@/fprintd
ProtectSystem=strict
ProtectKernelTunables=true
ProtectControlGroups=true
ReadWritePaths=@localstatedir@/lib/fprint
ReadWritePaths=/var/lib/fprint
ProtectHome=true
PrivateTmp=true
......
......@@ -13,8 +13,7 @@ AM_CFLAGS = \
$(DAEMON_CFLAGS) \
-DG_LOG_DOMAIN=\""fprintd"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
-DPLUGINDIR=\""$(libdir)/fprintd/modules"\" \
-DFILE_STORAGE_PATH=\""$(localstatedir)/lib/fprint"\"
-DPLUGINDIR=\""$(libdir)/fprintd/modules"\"
libfprintd_la_SOURCES = \
manager.c device.c \
......
......@@ -39,6 +39,7 @@
#include "file_storage.h"
#define FILE_STORAGE_PATH "/var/lib/fprint"
#define DIR_PERMS 0700
#define FP_FINGER_IS_VALID(finger) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment