summaryrefslogtreecommitdiffstats
path: root/src/volatile-root
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-19 20:26:37 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-19 21:14:34 +0100
commit5e332028f20566d8b9aa0d01c60aff8b9f43bcb7 (patch)
tree3d17977a29f551a36dc2d86b28e0bfd9e6b7a182 /src/volatile-root
parentMerge pull request #10811 from keszybz/define-main-through-macro (diff)
downloadsystemd-5e332028f20566d8b9aa0d01c60aff8b9f43bcb7.tar.xz
systemd-5e332028f20566d8b9aa0d01c60aff8b9f43bcb7.zip
util-lib: move main() definition macros to its own header file
This way, we can extend the macro a bit with stuff pulled in from other headers without this affecting everything which pulls in macro.h, which is one of our most basic headers. This is just refactoring, no change in behaviour, in prepartion for later changes.
Diffstat (limited to 'src/volatile-root')
-rw-r--r--src/volatile-root/volatile-root.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index ab7dca37b1..b08d42834f 100644
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -4,12 +4,13 @@
#include "alloc-util.h"
#include "fs-util.h"
+#include "main-func.h"
#include "mkdir.h"
#include "mount-util.h"
+#include "path-util.h"
#include "stat-util.h"
-#include "volatile-util.h"
#include "string-util.h"
-#include "path-util.h"
+#include "volatile-util.h"
static int make_volatile(const char *path) {
_cleanup_free_ char *old_usr = NULL;