X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=19786eb488d4083b1cfa63d1932d8e647a3de5d5;hb=8751decbc931f5fe64130567a3965fd05c698a64;hp=a592502631d4910631567bb44c4abd08ebbd392b;hpb=5e2aed57e68e6ac1b08667b529f5122dc3d13b78;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index a592502..19786eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,54 +14,59 @@
  * 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"
+#include "interfaces/localed/localed.c"
+#include "interfaces/timedated/timedated.c"
+#include "interfaces/logind/logind.c"
 
 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()) {
+        gchar *tmp;
+        tmp = "/etc/systemd_compat.conf"; 
 
-			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
-			return FALSE;
-		}
-	#endif
-	return TRUE;
+        g_printf("FAILED to open config %s! 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 */
+	}
+
+	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_init();
+	hostnamed_source = g_child_watch_source_new(*hostnamed_pid);
+	localed_source = g_child_watch_source_new(*localed_pid); */
 
-    mloop = g_main_loop_new(NULL, TRUE);
+	/*g_source_attach(hostnamed_source, NULL);
+	g_source_attach(localed_source, NULL);*/
 
-    g_main_loop_run(mloop);
-    g_main_loop_unref(mloop);
+	g_main_loop_run(mloop);
+	g_main_loop_unref(mloop);
 
-    return 0;
+	return 0;
 }