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 a592502631d4910631567bb44c4abd08ebbd392b..1d8f78b5b62959fedd4ae029ef5161bdaee6c7d1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,54 +14,44 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* debugging */
-#define INSTALL 1
-//#define NO_BUILTIN_XML 1
-/* end debugging */
-
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
+
 #include "config.c"
-#include "interfaces/hostnamed/hostnamed.c"
-//#include "main/h"
 
 gboolean systemd_utils_init() {
-       #ifdef INSTALL
-               if(!config_init()) {
-                       gchar *tmp;
-                       tmp = "/etc/"; //what the hell is /etc/xdg anyway
 
-                       g_printf("FAILED to install configs in %s!\n", tmp);
-                       return FALSE;
-               } 
-               if(!init_xml()) {
-                       const gchar * const *tmp;
-                       tmp = g_get_system_data_dirs();
+       if(!config_init()) {
 
-                       g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
-                       return FALSE;
-               }
-       #endif
-       return TRUE;
+        g_printf("FAILED to open config /etc/systemd_compat.conf! did you `make install`?\n", tmp);
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 int main() {
 
-    GMainLoop *mloop;
-    
-    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
-    }
+       GMainLoop *mloop;               
+       mloop = g_main_loop_new(NULL, TRUE);
+                       
+       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 */
+       }
 
-    hostnamed_init();
+       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;
 
-    mloop = g_main_loop_new(NULL, TRUE);
+       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);
+       g_main_loop_run(mloop);
+       g_main_loop_unref(mloop);
 
-    return 0;
+       return 0;
 }