main: we want all setup functions to be in files called xxx-setup.[ch]

diff --git a/Makefile.am b/Makefile.am
index b38489b616d2693b5a1d38b17a46c173c35b2ea0..8b1cafe702855faa5e4c35dbc8f94975afe03f97 100644 (file)
--- 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/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 \
        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 = \
 
 # ------------------------------------------------------------------------------
 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 \
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \

diff --git a/src/core/main.c b/src/core/main.c
index 4c2be261f5130393be24cf8345ac729cdc2b1a7d..9db83aa2e534c73c39db002a6121c2ca5ec08cf6 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -35,14 +35,6 @@
 
 #include "manager.h"
 #include "log.h"
 
 #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"
 #include "load-fragment.h"
 #include "fdset.h"
 #include "special.h"


@@ -56,6 +48,15 @@
 #include "virt.h"
 #include "watchdog.h"
 
 #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,
 static enum {
         ACTION_RUN,
         ACTION_HELP,

diff --git a/src/machine-id-setup.c b/src/machine-id-setup/machine-id-setup-main.c
similarity index 97%
rename from src/machine-id-setup.c
rename to src/machine-id-setup/machine-id-setup-main.c
index cb8101ea3c1214c2a5b586ad314011b2b435e039..ca8af596f7b346886585bc17a07af641e486ff46 100644 (file)
--- 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 <unistd.h>
 #include <stdlib.h>
 

-#include "machine-id-util.h"
+#include "machine-id-setup.h"

 #include "log.h"
 
 int main(int argc, char *argv[]) {
 #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
similarity index 99%
rename from src/shared/machine-id-util.c
rename to src/shared/machine-id-setup.c
index d65fd51131ab8697fdac996a4585d83103ef6333..9e84ac0cb990757d6981d1adef8c8d9507bdea12 100644 (file)
--- a/src/shared/machine-id-util.c
+++ b/src/shared/machine-id-setup.c
@@ -29,7 +29,7 @@
 
 #include <systemd/sd-id128.h>
 
 
 #include <systemd/sd-id128.h>
 

-#include "machine-id-util.h"
+#include "machine-id-setup.h"

 #include "macro.h"
 #include "util.h"
 #include "mkdir.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
similarity index 100%
rename from src/shared/machine-id-util.h
rename to src/shared/machine-id-setup.h