(1) regenerate leaner genfiles, we're not using the object manager functionality...

[systembsd.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index da8cdc68333c80aea24f55ce82985edae9d2037b..3c30ae041be0bafdb6540fcca353d682187a6b50 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,37 +14,27 @@
  * 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()) {
-                       gchar **tmp;
-                       tmp = g_get_system_data_dirs();
-
-                       g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
-                       return FALSE;
-               }*/
-       #endif
-       return TRUE;
+    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() {
@@ -53,10 +43,11 @@ int main() {
     
     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
+        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);