summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-26 18:44:13 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 13:25:55 +0100
commit4349cd7c1d153c4ffa23cf1cff1644e0afa9bcf0 (patch)
tree1ed7977ffe66d585938d0128c2994c097a106ec9 /src/core
parent6550203eb471595e41e27f46e5d0a00a4c0e47bb (diff)
util-lib: move mount related utility calls to mount-util.[ch]
Diffstat (limited to 'src/core')
-rw-r--r--src/core/automount.c1
-rw-r--r--src/core/machine-id-setup.c3
-rw-r--r--src/core/mount-setup.c21
-rw-r--r--src/core/namespace.c1
4 files changed, 15 insertions, 11 deletions
diff --git a/src/core/automount.c b/src/core/automount.c
index df98711d96..00911118e6 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -39,6 +39,7 @@
#include "io-util.h"
#include "label.h"
#include "mkdir.h"
+#include "mount-util.h"
#include "mount.h"
#include "parse-util.h"
#include "path-util.h"
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index ea4bdc5414..764728c804 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -31,12 +31,13 @@
#include "fd-util.h"
#include "fileio.h"
+#include "hexdecoct.h"
#include "io-util.h"
#include "log.h"
#include "machine-id-setup.h"
#include "macro.h"
#include "mkdir.h"
-#include "hexdecoct.h"
+#include "mount-util.h"
#include "path-util.h"
#include "process-util.h"
#include "string-util.h"
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 9b16eaa0e2..7486ec3985 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -25,22 +25,23 @@
#include <unistd.h>
#include <ftw.h>
-#include "mount-setup.h"
-#include "dev-setup.h"
#include "bus-util.h"
+#include "cgroup-util.h"
+#include "dev-setup.h"
+#include "efivars.h"
+#include "label.h"
#include "log.h"
#include "macro.h"
-#include "util.h"
-#include "label.h"
-#include "set.h"
-#include "strv.h"
+#include "missing.h"
#include "mkdir.h"
+#include "mount-setup.h"
+#include "mount-util.h"
#include "path-util.h"
-#include "missing.h"
-#include "virt.h"
-#include "efivars.h"
+#include "set.h"
#include "smack-util.h"
-#include "cgroup-util.h"
+#include "strv.h"
+#include "util.h"
+#include "virt.h"
typedef enum MountMode {
MNT_NONE = 0,
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 4d11d54bfe..e6c381800b 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -33,6 +33,7 @@
#include "loopback-setup.h"
#include "missing.h"
#include "mkdir.h"
+#include "mount-util.h"
#include "namespace.h"
#include "path-util.h"
#include "selinux-util.h"