From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 8 Mar 2023 11:57:39 +0000 (+0100)
Subject: lockfile-util: Rename to lock-util
X-Git-Tag: v254-rc1~1066^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64e89f56a9665dee890a2db4ca299b42bfe9c256;p=thirdparty%2Fsystemd.git

lockfile-util: Rename to lock-util
---

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 3a0e155f383..143156484bc 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -12,7 +12,7 @@
 #include "alloc-util.h"
 #include "ether-addr-util.h"
 #include "hexdecoct.h"
-#include "lockfile-util.h"
+#include "lock-util.h"
 #include "missing_network.h"
 #include "netif-naming-scheme.h"
 #include "netlink-util.h"
diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c
index 6d294efd848..17a3ac679af 100644
--- a/src/shared/discover-image.c
+++ b/src/shared/discover-image.c
@@ -27,7 +27,7 @@
 #include "hashmap.h"
 #include "hostname-setup.h"
 #include "id128-util.h"
-#include "lockfile-util.h"
+#include "lock-util.h"
 #include "log.h"
 #include "loop-util.h"
 #include "macro.h"
diff --git a/src/shared/discover-image.h b/src/shared/discover-image.h
index a8874228dcf..3c6928619c0 100644
--- a/src/shared/discover-image.h
+++ b/src/shared/discover-image.h
@@ -7,7 +7,7 @@
 #include "sd-id128.h"
 
 #include "hashmap.h"
-#include "lockfile-util.h"
+#include "lock-util.h"
 #include "macro.h"
 #include "path-util.h"
 #include "string-util.h"
diff --git a/src/shared/lockfile-util.c b/src/shared/lock-util.c
similarity index 99%
rename from src/shared/lockfile-util.c
rename to src/shared/lock-util.c
index dd07ea0cabd..81bdc03bc89 100644
--- a/src/shared/lockfile-util.c
+++ b/src/shared/lock-util.c
@@ -10,7 +10,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
-#include "lockfile-util.h"
+#include "lock-util.h"
 #include "macro.h"
 #include "missing_fcntl.h"
 #include "path-util.h"
diff --git a/src/shared/lockfile-util.h b/src/shared/lock-util.h
similarity index 100%
rename from src/shared/lockfile-util.h
rename to src/shared/lock-util.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 82fd206d692..0c8d8061100 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -98,7 +98,7 @@ shared_sources = files(
         'libmount-util.c',
         'local-addresses.c',
         'locale-setup.c',
-        'lockfile-util.c',
+        'lock-util.c',
         'logs-show.c',
         'loop-util.c',
         'loopback-setup.c',