mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-09 04:13:33 +02:00
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.
This commit is contained in:
committed by
Will Thompson
parent
8ae7abc6c2
commit
9ed8767cb3
@ -15,7 +15,7 @@ if HAVE_SYSTEMD
|
|||||||
systemdservicedir = $(systemdsystemunitdir)
|
systemdservicedir = $(systemdsystemunitdir)
|
||||||
systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
|
systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
|
||||||
$(systemdservice_DATA): $(systemdservice_in_files) Makefile
|
$(systemdservice_DATA): $(systemdservice_in_files) Makefile
|
||||||
@sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@localstatedir\@|$(localstatedir)|" $< > $@
|
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
polkitdir = $(datadir)/polkit-1/actions
|
polkitdir = $(datadir)/polkit-1/actions
|
||||||
|
|||||||
@ -11,7 +11,7 @@ ExecStart=@libexecdir@/fprintd
|
|||||||
ProtectSystem=strict
|
ProtectSystem=strict
|
||||||
ProtectKernelTunables=true
|
ProtectKernelTunables=true
|
||||||
ProtectControlGroups=true
|
ProtectControlGroups=true
|
||||||
ReadWritePaths=@localstatedir@/lib/fprint
|
ReadWritePaths=/var/lib/fprint
|
||||||
ProtectHome=true
|
ProtectHome=true
|
||||||
PrivateTmp=true
|
PrivateTmp=true
|
||||||
|
|
||||||
|
|||||||
@ -13,8 +13,7 @@ AM_CFLAGS = \
|
|||||||
$(DAEMON_CFLAGS) \
|
$(DAEMON_CFLAGS) \
|
||||||
-DG_LOG_DOMAIN=\""fprintd"\" \
|
-DG_LOG_DOMAIN=\""fprintd"\" \
|
||||||
-DLOCALEDIR=\""$(datadir)/locale"\" \
|
-DLOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
-DPLUGINDIR=\""$(libdir)/fprintd/modules"\" \
|
-DPLUGINDIR=\""$(libdir)/fprintd/modules"\"
|
||||||
-DFILE_STORAGE_PATH=\""$(localstatedir)/lib/fprint"\"
|
|
||||||
|
|
||||||
libfprintd_la_SOURCES = \
|
libfprintd_la_SOURCES = \
|
||||||
manager.c device.c \
|
manager.c device.c \
|
||||||
|
|||||||
@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
#include "file_storage.h"
|
#include "file_storage.h"
|
||||||
|
|
||||||
|
#define FILE_STORAGE_PATH "/var/lib/fprint"
|
||||||
#define DIR_PERMS 0700
|
#define DIR_PERMS 0700
|
||||||
|
|
||||||
#define FP_FINGER_IS_VALID(finger) \
|
#define FP_FINGER_IS_VALID(finger) \
|
||||||
|
|||||||
Reference in New Issue
Block a user