diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index d8cbaa3..73a6aed 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -42,9 +42,9 @@ int yon_bootloader_save(main_window *widgets){ yon_char_parsed_free(user_parameters,param_size); int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,GRUB_TIMEOUT_parameter,AUTOLOGINUSER_parameter,GRUB_SUPERUSERS_parameter,NULL); - if (parameters){ + if (parameters||user_parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); - char *command = yon_char_unite(ubconfig_dull_command," --target system remove [autoinstall] ",GRUB_PASSWORD_parameter_all,"; ",ubconfig_dull_command,"--target system ",command_parameters, " ", user_string, NULL); + char *command = yon_char_unite(ubconfig_dull_command,"--target system remove [autoinstall] ",GRUB_PASSWORD_parameter_all,"; ",ubconfig_dull_command,"--target system ",command_parameters, " ", user_string, NULL); if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); @@ -443,6 +443,8 @@ void yon_bootloader_interface_update(main_window *widgets){ for (int i=0;iNetworkNTPServerSwitch))){ @@ -235,6 +239,16 @@ int yon_network_save(main_window *widgets){ yon_config_remove_by_key(hostname_parameter); } + { + int size; + config_str users = yon_config_get_all_by_key(NETWORK_parameter_search,&size); + for (int i=0;iNetworkConnectionsBox)); GList *iter; for (iter=list;iter;iter=iter->next){ @@ -290,17 +304,19 @@ int yon_network_save(main_window *widgets){ } } if (!main_config.configure_mode){ - int connect_size; + int connect_size=0; + int param_size=0; - config_str connections = yon_config_get_all_by_key(NETWORK_parameter_search,&connect_size); - char *connections_string = yon_char_parsed_to_string(connections,connect_size," "); + config_str connections = yon_config_get_all_keys_by_key(NETWORK_parameter_search,&connect_size); + config_str connection_parameters = yon_config_get_save_parameters_by_list(¶m_size,connections,connect_size); yon_char_parsed_free(connections,connect_size); int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,DOMAIN_parameter,DOMAIN_admanger_parameter,NTPSERVERS_parameter,hostname_parameter,NULL); - if (parameters){ + if (parameters||connection_parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); - char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters, " ", connections_string,NULL); + char *connections_string = yon_char_parsed_to_string(connection_parameters,param_size," -- "); + char *command = yon_char_unite(ubconfig_dull_command,"--target system remove [autoinstall] ",NETWORK_parameter_all,"; ", ubconfig_dull_command,"--target system ",yon_char_return_if_exist(command_parameters,""), " ", connections_string,NULL); if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); @@ -392,6 +408,7 @@ void yon_network_init(main_window *widgets){ for (int i=0;i