From: kremlin Date: Thu, 3 Jul 2014 15:26:51 +0000 (-0500) Subject: cut out old XML install cruft X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=commitdiff_plain;h=408babffc42793ecd708f80647fa449438180759;p=systembsd.git cut out old XML install cruft --- diff --git a/src/config.c b/src/config.c index 21396a5..68ea3be 100644 --- a/src/config.c +++ b/src/config.c @@ -62,42 +62,6 @@ gboolean config_init() { config_path = "/etc/systemd_compat.conf"; config_lstat_ret = g_lstat(config_path, config_lstat); - /* this should all be handled in the makefile - * does conf exist? - if(config_lstat_ret) { - - if(g_access("/etc/", W_OK)) { - g_printf("%s\n", "no write permissions for /etc/! exiting.."); - return FALSE; - } - - int config_descr; - config_descr = g_open(config_path, O_CREAT, 644); - - gchar *posix_hostname; - posix_hostname = g_malloc(HOST_NAME_MAX); - - gethostname(posix_hostname, HOST_NAME_MAX); - - g_key_file_set_string(config, "hostnamed", "Hostname", posix_hostname); - g_key_file_set_string(config, "hostnamed", "PrettyHostname", ""); - g_key_file_set_string(config, "hostnamed", "IconName", "Computer"); - g_key_file_set_string(config, "hostnamed", "ChassisType","laptop"); - - if(!g_key_file_save_to_file(config, config_path, NULL)) { - g_printf("failed to write config to %s!\n", config_path); - g_free(posix_hostname); - return FALSE; - } - - g_printf("wrote config to %s\n", config_path); - - g_free(posix_hostname); - - return TRUE; - - } else { */ - if(g_access(config_path, W_OK)) { g_printf("%s\n", "no write permissions for /etc/! exiting.."); @@ -109,59 +73,6 @@ gboolean config_init() { g_printf("could not read config at %s! exiting..", config_path); return FALSE; } -/* this definitely does not need to exist -gboolean init_xml() { - - const gchar * const *data_dir_prefix; - int xml_lstat_ret; - GStatBuf *xml_lstat; - - data_dir_prefix = g_get_system_data_dirs(); - data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL); - - xml_lstat_ret = g_lstat(data_dir, xml_lstat); - - if(xml_lstat_ret) { - - if(g_access(data_dir_prefix[0], W_OK)) { - g_printf("no write permissions for %s! exiting...\n", data_dir_prefix[0]); - return FALSE; - } - - g_printf("creating xml data directory %s...\n", data_dir); - - if(g_mkdir(data_dir, 644) || g_access) { - g_printf("failed to create dir %s...\n", data_dir); - return FALSE; - } - - if(!read_xml_from_installconf()) { - g_printf("failed to read xml configs in conf/...\n"); - return FALSE; - } - - if(!populate_xml_data_dir()) { - g_printf("failed to write xml configs to %s...\n", data_dir); - return FALSE; - } - - if(!set_xml_descriptors()) { - g_printf("failed to fopen xml configs...\n"); - return FALSE; - } - - return TRUE; - - } else { - - if(!set_xml_descriptors()) { - g_printf("failed to fopen xml configs...\n"); - return FALSE; - } - - return TRUE; - } -} */ void clean_config() { diff --git a/src/config.h b/src/config.h index 3fdf183..50224a9 100644 --- a/src/config.h +++ b/src/config.h @@ -1,20 +1,6 @@ -/*our buffers for xml config file contents */ -static gchar **hostnamed_ispect_xml, **hostnamed_dbus_xml, - **localed_ispect_xml, **localed_dbus_xml, - **timedated_ispect_xml, **timedated_dbus_xml, - **logind_ispect_xml, **logind_dbus_xml; - /* manually increment this if adding new functionality/config files */ static const guint XML_FILE_COUNT = 8; -/* i'm not sure we even need to load in ispect xml.. -gchar **xml_contents[] = { - hostnamed_ispect_xml, hostnamed_dbus_xml, - localed_ispect_xml, localed_dbus_xml, - timedated_ispect_xml, timedated_dbus_xml, - logind_ispect_xml, logind_dbus_xml -};*/ - /* TODO ifdef allowed editable xml only take files that meet exact sizes * of ones hashed below */ diff --git a/src/main.c b/src/main.c index f8cb5ef..b2a481d 100644 --- a/src/main.c +++ b/src/main.c @@ -29,13 +29,6 @@ gboolean systemd_utils_init() { 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; }