summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-12 15:44:50 +0100
committerLennart Poettering <lennart@poettering.net>2021-11-16 17:03:28 +0100
commit35cd0ba516fb0e2ee5744b9185f7df903962c726 (patch)
treeb2bd0411918b1c38b8b5997a6e5c17c2e5f3ddd8 /src/machine
parented304a5d73389023a542841faeb277ccca798549 (diff)
downloadsystemd-35cd0ba516fb0e2ee5744b9185f7df903962c726.tar.gz
shared: clean up mkdir.h/label.h situation
Previously the mkdir_label() family of calls was implemented in src/shared/mkdir-label.c but its functions partly declared ins src/shared/label.h and partly in src/basic/mkdir.h (!!). That's weird (and wrong). Let's clean this up, and add a proper mkdir-label.h matching the .c file.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machine.c2
-rw-r--r--src/machine/machined.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c
index a42478e874..80f73da94a 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -19,7 +19,7 @@
#include "hashmap.h"
#include "machine-dbus.h"
#include "machine.h"
-#include "mkdir.h"
+#include "mkdir-label.h"
#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 4ab459d3ca..6ffa4191ec 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -18,10 +18,10 @@
#include "fd-util.h"
#include "format-util.h"
#include "hostname-util.h"
-#include "label.h"
#include "machined-varlink.h"
#include "machined.h"
#include "main-func.h"
+#include "mkdir-label.h"
#include "process-util.h"
#include "service-util.h"
#include "signal-util.h"