summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/automount.c2
-rw-r--r--src/core/execute.c2
-rw-r--r--src/core/manager.c2
-rw-r--r--src/core/namespace.c2
-rw-r--r--src/core/socket.c2
-rw-r--r--src/core/unit.c2
-rw-r--r--src/login/logind-user.c2
-rw-r--r--src/login/user-runtime-dir.c2
-rw-r--r--src/nspawn/nspawn-mount.c2
-rw-r--r--src/resolve/resolved-resolv-conf.c2
-rw-r--r--src/shared/dev-setup.c2
-rw-r--r--src/shared/hwdb-util.c2
-rw-r--r--src/shared/label-util.c (renamed from src/shared/label.c)2
-rw-r--r--src/shared/label-util.h (renamed from src/shared/label.h)0
-rw-r--r--src/shared/machine-pool.c2
-rw-r--r--src/shared/meson.build2
-rw-r--r--src/shared/mount-setup.c2
-rw-r--r--src/shared/mount-util.c2
-rw-r--r--src/shared/selinux-util.h2
-rw-r--r--src/shared/smack-util.h2
-rw-r--r--src/tmpfiles/tmpfiles.c2
-rw-r--r--src/udev/udev-node.c2
22 files changed, 21 insertions, 21 deletions
diff --git a/src/core/automount.c b/src/core/automount.c
index 5df697bf22..3254275d6b 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -21,7 +21,7 @@
#include "format-util.h"
#include "fstab-util.h"
#include "io-util.h"
-#include "label.h"
+#include "label-util.h"
#include "mkdir-label.h"
#include "mount-util.h"
#include "mount.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index 5e327465da..b2804e52e9 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -65,7 +65,7 @@
#include "hexdecoct.h"
#include "io-util.h"
#include "ioprio-util.h"
-#include "label.h"
+#include "label-util.h"
#include "log.h"
#include "macro.h"
#include "manager.h"
diff --git a/src/core/manager.c b/src/core/manager.c
index f8d469ebf6..78d1a032e6 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -54,7 +54,7 @@
#include "inotify-util.h"
#include "install.h"
#include "io-util.h"
-#include "label.h"
+#include "label-util.h"
#include "load-fragment.h"
#include "locale-setup.h"
#include "log.h"
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 1116ece59d..b00f27e08f 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -22,7 +22,7 @@
#include "fd-util.h"
#include "format-util.h"
#include "glyph-util.h"
-#include "label.h"
+#include "label-util.h"
#include "list.h"
#include "lock-util.h"
#include "loop-util.h"
diff --git a/src/core/socket.c b/src/core/socket.c
index a6477de5a0..7c596182c2 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -26,7 +26,7 @@
#include "in-addr-util.h"
#include "io-util.h"
#include "ip-protocol-list.h"
-#include "label.h"
+#include "label-util.h"
#include "log.h"
#include "mkdir-label.h"
#include "parse-util.h"
diff --git a/src/core/unit.c b/src/core/unit.c
index 90f87a95f5..55bc926c2f 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -32,7 +32,7 @@
#include "id128-util.h"
#include "install.h"
#include "io-util.h"
-#include "label.h"
+#include "label-util.h"
#include "load-dropin.h"
#include "load-fragment.h"
#include "log.h"
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 6161af9a74..7a6056086a 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -17,7 +17,7 @@
#include "format-util.h"
#include "fs-util.h"
#include "hashmap.h"
-#include "label.h"
+#include "label-util.h"
#include "limits-util.h"
#include "logind-dbus.h"
#include "logind-user-dbus.h"
diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index 5a16d1684d..7513f65756 100644
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -10,7 +10,7 @@
#include "dev-setup.h"
#include "format-util.h"
#include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
#include "limits-util.h"
#include "main-func.h"
#include "mkdir-label.h"
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index fcf5c710f1..0a85b5d89a 100644
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -9,7 +9,7 @@
#include "fd-util.h"
#include "format-util.h"
#include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
#include "mkdir-label.h"
#include "mount-util.h"
#include "mountpoint-util.h"
diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 5749aa1dc3..52e31d2fd3 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -10,7 +10,7 @@
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
#include "ordered-set.h"
#include "resolved-conf.h"
#include "resolved-dns-server.h"
diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index e0db777c96..7dca6ad7d4 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -6,7 +6,7 @@
#include "alloc-util.h"
#include "dev-setup.h"
-#include "label.h"
+#include "label-util.h"
#include "log.h"
#include "mkdir-label.h"
#include "nulstr-util.h"
diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
index 785611f8c4..a2fbcd7078 100644
--- a/src/shared/hwdb-util.c
+++ b/src/shared/hwdb-util.c
@@ -11,7 +11,7 @@
#include "fs-util.h"
#include "hwdb-internal.h"
#include "hwdb-util.h"
-#include "label.h"
+#include "label-util.h"
#include "mkdir-label.h"
#include "nulstr-util.h"
#include "path-util.h"
diff --git a/src/shared/label.c b/src/shared/label-util.c
index 66fcc0a31f..c0639e3a88 100644
--- a/src/shared/label.c
+++ b/src/shared/label-util.c
@@ -6,7 +6,7 @@
#include "btrfs-util.h"
#include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
#include "macro.h"
#include "selinux-util.h"
#include "smack-util.h"
diff --git a/src/shared/label.h b/src/shared/label-util.h
index 2f899e2bdd..2f899e2bdd 100644
--- a/src/shared/label.h
+++ b/src/shared/label-util.h
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index fb0b2f5adc..b372de40a3 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -3,7 +3,7 @@
#include <errno.h>
#include "btrfs-util.h"
-#include "label.h"
+#include "label-util.h"
#include "machine-pool.h"
#include "missing_magic.h"
#include "stat-util.h"
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 021ba517f8..31241bc08d 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -96,7 +96,7 @@ shared_sources = files(
'kernel-image.c',
'keyring-util.c',
'killall.c',
- 'label.c',
+ 'label-util.c',
'libcrypt-util.c',
'libfido2-util.c',
'libmount-util.c',
diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index 6162a58d9a..fd14cd8598 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -17,7 +17,7 @@
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
-#include "label.h"
+#include "label-util.h"
#include "log.h"
#include "macro.h"
#include "mkdir-label.h"
diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index 7a06cc75ae..81b681afa7 100644
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -22,7 +22,7 @@
#include "glyph-util.h"
#include "hashmap.h"
#include "initrd-util.h"
-#include "label.h"
+#include "label-util.h"
#include "libmount-util.h"
#include "missing_mount.h"
#include "missing_syscall.h"
diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h
index e9771a28fe..238550ef52 100644
--- a/src/shared/selinux-util.h
+++ b/src/shared/selinux-util.h
@@ -7,7 +7,7 @@
#include <sys/types.h>
#include "macro.h"
-#include "label.h"
+#include "label-util.h"
#if HAVE_SELINUX
#include <selinux/selinux.h>
diff --git a/src/shared/smack-util.h b/src/shared/smack-util.h
index 17b31c6c25..953bf91358 100644
--- a/src/shared/smack-util.h
+++ b/src/shared/smack-util.h
@@ -10,7 +10,7 @@
#include <stdbool.h>
#include <sys/types.h>
-#include "label.h"
+#include "label-util.h"
#include "macro.h"
#define SMACK_FLOOR_LABEL "_"
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index e16f26d8d5..add3f07cb2 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -41,7 +41,7 @@
#include "glob-util.h"
#include "hexdecoct.h"
#include "io-util.h"
-#include "label.h"
+#include "label-util.h"
#include "log.h"
#include "macro.h"
#include "main-func.h"
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index e49e959cd8..098e8ed0cc 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -15,7 +15,7 @@
#include "format-util.h"
#include "fs-util.h"
#include "hexdecoct.h"
-#include "label.h"
+#include "label-util.h"
#include "mkdir-label.h"
#include "parse-util.h"
#include "path-util.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 03:44:44 +0100