X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=f8cb5efafd225102e3178566d0f9dc8c8eea3135;hb=9c62dcb8c491ca195141a39ef715b55ca1dfda6e;hp=a592502631d4910631567bb44c4abd08ebbd392b;hpb=53f83ba5960811b25e6060dfb05d3ff81459e748;p=systembsd.git diff --git a/src/main.c b/src/main.c index a592502..f8cb5ef 100644 --- a/src/main.c +++ b/src/main.c @@ -14,37 +14,29 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* debugging */ -#define INSTALL 1 -//#define NO_BUILTIN_XML 1 -/* end debugging */ - #include #include #include #include #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(); - - 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!\n", tmp); + return FALSE; + } + /*if(!init_xml()) { + const gchar * const *tmp; + tmp = g_get_system_data_dirs(); + + g_printf("FAILED to install xml configs in %s!\n", tmp[0]); + return FALSE; + }*/ + return TRUE; } int main() { @@ -53,7 +45,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();