X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=b2a481d39d196a92452d642a5f565e3e06c5cbfa;hb=2068f216167f380e21f701531e4c19f85cda5937;hp=fc50a2445cdd8bc547163381d62f59c52ea7f6ab;hpb=e3382563a24b6a3c162763942edefee462b2d752;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index fc50a24..b2a481d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,47 +14,22 @@
  * 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() {
-<<<<<<< HEAD
-	#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();
+    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;
-=======
-    #ifdef INSTALL
-        if(!config_init()) {
-            g_printf("%s\n", "FAILED to install configs in /etc/!");
-            return FALSE; 
-        }
-    #endif
+        g_printf("FAILED to open config %s!\n", tmp);
+        return FALSE;
+    } 
     return TRUE;
->>>>>>> master
 }
 
 int main() {
@@ -63,7 +38,7 @@ 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();