X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Fmain.c;h=3c30ae041be0bafdb6540fcca353d682187a6b50;hp=59e23fe96ea74a26525ccde1cba2d10b629a02b2;hb=5b005882b2af5868261a01a386028291516aabb0;hpb=929eb2a9b45b11b5e3d76f1d4ac744853b7ab2fe

diff --git a/src/main.c b/src/main.c
index 59e23fe..3c30ae0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,26 +1,58 @@
-/* debugging */
-#define INSTALL 1
-#define NO_BUILTIN_XML 1
-
-/* end debugging */
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 
 #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"
+#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);
+        return FALSE;
+    } 
+    return TRUE;
+}
 
 int main() {
 
-	#if (defined NO_BUILTIN_XML && defined INSTALL)
-		if(!install_conf())
-			g_printf("%s\n", "FAILED to install xml configs!");;		
-	#else
-	#endif
+    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 */
+    }
+
+    hostnamed_init();
+	localed_init();
+
+    mloop = g_main_loop_new(NULL, TRUE);
 
-	GMainLoop *mloop = NULL;
-	
-	mloop = g_main_loop_new(NULL, FALSE);
-	hostnamed_init();
-	g_main_loop_run(mloop);
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-	return 0;
+    return 0;
 }