|
|
|
|
@ -571,25 +571,29 @@ void *on_config_save(void *data){
|
|
|
|
|
g_signal_connect(G_OBJECT(widgets->install_info_monitor),"changed",G_CALLBACK(yon_installation_progress_update),widgets);
|
|
|
|
|
g_object_unref(file_desc);
|
|
|
|
|
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
|
|
|
|
|
char *command = yon_debug_output("%s\n",save_config_command(yon_char_parsed_to_string(parameters,size," ")));
|
|
|
|
|
yon_char_parsed_free(parameters,size);
|
|
|
|
|
yon_debug_output("%s\n","Entered installation");
|
|
|
|
|
if (system(yon_debug_output("%s\n",command))){
|
|
|
|
|
|
|
|
|
|
gdk_threads_add_idle((GSourceFunc)on_install_error,widgets);
|
|
|
|
|
if (!main_config.dry_run){
|
|
|
|
|
char *command = yon_debug_output("%s\n",save_config_command(yon_char_parsed_to_string(parameters,size," ")));
|
|
|
|
|
yon_char_parsed_free(parameters,size);
|
|
|
|
|
yon_debug_output("%s\n","Entered installation");
|
|
|
|
|
if (system(yon_debug_output("%s\n",command))){
|
|
|
|
|
|
|
|
|
|
gdk_threads_add_idle((GSourceFunc)on_install_error,widgets);
|
|
|
|
|
free(command);
|
|
|
|
|
g_mutex_lock(&main_config.install_mutex);
|
|
|
|
|
main_config.install_complete=1;
|
|
|
|
|
g_mutex_unlock(&main_config.install_mutex);
|
|
|
|
|
return 0;
|
|
|
|
|
};
|
|
|
|
|
free(command);
|
|
|
|
|
g_mutex_lock(&main_config.install_mutex);
|
|
|
|
|
main_config.install_complete=1;
|
|
|
|
|
g_mutex_unlock(&main_config.install_mutex);
|
|
|
|
|
return 0;
|
|
|
|
|
};
|
|
|
|
|
free(command);
|
|
|
|
|
g_mutex_lock(&main_config.install_mutex);
|
|
|
|
|
main_config.install_complete=1;
|
|
|
|
|
g_mutex_unlock(&main_config.install_mutex);
|
|
|
|
|
if ((!main_config.save_done)&&main_config.save_configured){
|
|
|
|
|
on_setup_system_configuration(widgets);
|
|
|
|
|
on_page_next_clicked(NULL,widgets);
|
|
|
|
|
if ((!main_config.save_done)&&main_config.save_configured){
|
|
|
|
|
on_setup_system_configuration(widgets);
|
|
|
|
|
on_page_next_clicked(NULL,widgets);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
yon_launch("ubconfig --source system get /");
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
@ -674,12 +678,17 @@ void *on_setup_system_configuration(void * data){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!main_config.dry_run){
|
|
|
|
|
char *parameter_string = yon_char_parsed_to_string(all_parameters,size," ");
|
|
|
|
|
char *command = set_user_config_command(parameter_string);
|
|
|
|
|
if (system(yon_debug_output("%s\n",command))){};
|
|
|
|
|
yon_char_parsed_free(all_parameters,size);
|
|
|
|
|
free(command);
|
|
|
|
|
if (parameter_string) free(parameter_string);
|
|
|
|
|
} else {
|
|
|
|
|
yon_launch("ubconfig --source system get /");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
g_idle_add((GSourceFunc)on_install_success,widgets);
|
|
|
|
|
return NULL;
|
|
|
|
|
|