cut out config.c & config.h, they are unnessecary

[systembsd.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3bc43447469fb9dc80caaf56caaee51241931094..1d8f78b5b62959fedd4ae029ef5161bdaee6c7d1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -21,20 +21,14 @@
 
 #include "config.c"
 
-#include "interfaces/hostnamed/hostnamed.c"
-#include "interfaces/localed/localed.c"
-#include "interfaces/timedated/timedated.c"
-#include "interfaces/logind/logind.c"
-
 gboolean systemd_utils_init() {
 
        if(!config_init()) {
-        gchar *tmp;
-        tmp = "/etc/systemd_compat.conf"; 
 
-        g_printf("FAILED to open config %s! did you `make install`?\n", tmp);
+        g_printf("FAILED to open config /etc/systemd_compat.conf! did you `make install`?\n", tmp);
         return FALSE;
-    } 
+    }
+
     return TRUE;
 }
 
@@ -42,43 +36,19 @@ int main() {
 
        GMainLoop *mloop;               
        mloop = g_main_loop_new(NULL, TRUE);
-
-       #ifdef COMPILE_HOSTNAMED_BINARY
-               hostnamed_init();
-       #endif
-       #ifdef COMPILE_LOCALED_BINARY
-               localed_init();
-       #endif
-       #ifdef COMPILE_TIMEDATED_BINARY
-       #endif
-       #ifdef COMPILE_LOGIND_BINARY
-       #endif
-
-       #if !defined(COMPILE_HOSTNAMED_BINARY) && !defined(COMPILE_LOCALED_BINARY) && !defined(COMPILE_TIMEDATED_BINARY) && !defined(COMPILE_LOGIND_BINARY)
-               
-               if(!systemd_utils_init()) {
-                       g_printf("failed to init, are you root?\n");
-                       return 1; /* TODO errno properly. grep for all "return 1;"s, not TODO'ing each one */
-               }
-
-               gboolean hostnamed_init_ok, localed_init_ok;
-               GPid *hostnamed_pid, *localed_pid;
-               gchar *hostnamed_argv[0], *localed_argv[0];
-               GSource *hostnamed_source, *localed_source, *timedated_source, *logind_source;
-
-               hostnamed_argv[0] = "/usr/local/libexec/systemd-hostnamed-handler";
-               localed_argv[0] = "/usr/local/libexec/systemd-localed-handler";
-
-               hostnamed_init_ok = g_spawn_async(NULL, hostnamed_argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, hostnamed_pid, NULL);
-               localed_init_ok = g_spawn_async(NULL, localed_argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, localed_pid, NULL);
-
-               hostnamed_source = g_child_watch_source_new(*hostnamed_pid);
-               localed_source = g_child_watch_source_new(*localed_pid);
-
-               /*g_source_attach(hostnamed_source, NULL);
-               g_source_attach(localed_source, NULL);*/
-
-       #endif
+                       
+       if(!systemd_utils_init()) {
+               g_printf("failed to init, are you root?\n");
+               return 1; /* TODO errno properly. grep for all "return 1;"s, not TODO'ing each one */
+       }
+
+       gboolean hostnamed_init_ok, localed_init_ok;
+       GPid *hostnamed_pid, *localed_pid;
+       gchar *hostnamed_argv[0], *localed_argv[0];
+       GSource *hostnamed_source, *localed_source, *timedated_source, *logind_source;
+
+       hostnamed_argv[0] = "/usr/local/libexec/systemd-hostnamed-handler";
+       localed_argv[0] = "/usr/local/libexec/systemd-localed-handler";
 
        g_main_loop_run(mloop);
        g_main_loop_unref(mloop);