From 4349cd7c1d153c4ffa23cf1cff1644e0afa9bcf0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Oct 2015 18:44:13 +0100
Subject: util-lib: move mount related utility calls to mount-util.[ch]

---
 src/core/automount.c        |  1 +
 src/core/machine-id-setup.c |  3 ++-
 src/core/mount-setup.c      | 21 +++++++++++----------
 src/core/namespace.c        |  1 +
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/core')

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"
-- 
cgit v1.2.3-54-g00ecf