From: Karel Zak <kzak@redhat.com>
Date: Mon, 4 Mar 2024 11:35:09 +0000 (+0100)
Subject: build-sys: make sure everywhere is localstatedir
X-Git-Tag: v2.42-start~497
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=720301e04f339274652150f305d9e9f3e504ac6e;p=thirdparty%2Futil-linux.git

build-sys: make sure everywhere is localstatedir

_PATH_LOCALSTATEDIR and @localstatedir@ are defined by build-systems
and it's necessary to use it everywhere to keep things consistent.

Reference: https://github.com/util-linux/util-linux/pull/2825
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/liblastlog2/src/lastlog2.h b/liblastlog2/src/lastlog2.h
index 28ed096c5..280f387d6 100644
--- a/liblastlog2/src/lastlog2.h
+++ b/liblastlog2/src/lastlog2.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#define LL2_DEFAULT_DATABASE "/var/lib/lastlog/lastlog2.db"
+#define LL2_DEFAULT_DATABASE _PATH_LOCALSTATEDIR "/lib/lastlog/lastlog2.db"
 
 #include <stdint.h>
 
diff --git a/misc-utils/uuidd.service.in b/misc-utils/uuidd.service.in
index 330f1ab9b..529d72388 100644
--- a/misc-utils/uuidd.service.in
+++ b/misc-utils/uuidd.service.in
@@ -16,7 +16,7 @@ ProtectKernelTunables=yes
 ProtectKernelModules=yes
 ProtectControlGroups=yes
 MemoryDenyWriteExecute=yes
-ReadWritePaths=/var/lib/libuuid/
+ReadWritePaths=@localstatedir@/lib/libuuid/
 SystemCallFilter=@default @file-system @basic-io @system-service @signal @io-event @network-io
 
 [Install]