summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-12 14:28:43 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-12 14:29:29 +0200
commitb6e661357ce25601829943c7f98981a92b3f1b68 (patch)
tree62741befc548d51c7dd4c02a7ba1e30a257dfb8f
parent90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d (diff)
main: we want all setup functions to be in files called xxx-setup.[ch]
-rw-r--r--Makefile.am6
-rw-r--r--src/core/main.c17
-rw-r--r--src/machine-id-setup/machine-id-setup-main.c (renamed from src/machine-id-setup.c)2
-rw-r--r--src/shared/machine-id-setup.c (renamed from src/shared/machine-id-util.c)2
-rw-r--r--src/shared/machine-id-setup.h (renamed from src/shared/machine-id-util.h)0
5 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index b38489b616..8b1cafe702 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -565,8 +565,8 @@ libsystemd_shared_la_SOURCES = \
src/shared/spawn-ask-password-agent.h \
src/shared/mount-setup.c \
src/shared/mount-setup.h \
- src/shared/machine-id-util.c \
- src/shared/machine-id-util.h \
+ src/shared/machine-id-setup.c \
+ src/shared/machine-id-setup.h \
src/shared/loopback-setup.h \
src/shared/loopback-setup.c \
src/shared/specifier.c \
@@ -988,7 +988,7 @@ systemd_tmpfiles_LDADD = \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
- src/machine-id-setup.c
+ src/machine-id-setup/machine-id-setup-main.c
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
diff --git a/src/core/main.c b/src/core/main.c
index 4c2be261f5..9db83aa2e5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -35,14 +35,6 @@
#include "manager.h"
#include "log.h"
-#include "mount-setup.h"
-#include "hostname-setup.h"
-#include "loopback-setup.h"
-#include "kmod-setup.h"
-#include "locale-setup.h"
-#include "selinux-setup.h"
-#include "ima-setup.h"
-#include "machine-id-util.h"
#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
@@ -56,6 +48,15 @@
#include "virt.h"
#include "watchdog.h"
+#include "mount-setup.h"
+#include "loopback-setup.h"
+#include "kmod-setup.h"
+#include "hostname-setup.h"
+#include "machine-id-setup.h"
+#include "locale-setup.h"
+#include "selinux-setup.h"
+#include "ima-setup.h"
+
static enum {
ACTION_RUN,
ACTION_HELP,
diff --git a/src/machine-id-setup.c b/src/machine-id-setup/machine-id-setup-main.c
index cb8101ea3c..ca8af596f7 100644
--- a/src/machine-id-setup.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -22,7 +22,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include "machine-id-util.h"
+#include "machine-id-setup.h"
#include "log.h"
int main(int argc, char *argv[]) {
diff --git a/src/shared/machine-id-util.c b/src/shared/machine-id-setup.c
index d65fd51131..9e84ac0cb9 100644
--- a/src/shared/machine-id-util.c
+++ b/src/shared/machine-id-setup.c
@@ -29,7 +29,7 @@
#include <systemd/sd-id128.h>
-#include "machine-id-util.h"
+#include "machine-id-setup.h"
#include "macro.h"
#include "util.h"
#include "mkdir.h"
diff --git a/src/shared/machine-id-util.h b/src/shared/machine-id-setup.h
index 16f45d86d3..16f45d86d3 100644
--- a/src/shared/machine-id-util.h
+++ b/src/shared/machine-id-setup.h