Fixed kernel loading

pull/284/head
parent 4d819797e5
commit d2a468f4ae

@ -132,7 +132,10 @@ msgid "Chromium and some plugins"
msgstr "Chromium и некоторые другие плагины" msgstr "Chromium и некоторые другие плагины"
msgid "Office" msgid "Office"
msgstr "Office" msgstr "Офис"
msgid "Office packet"
msgstr "Офисный пакет"
msgid "Browser" msgid "Browser"
msgstr "Браузер" msgstr "Браузер"

@ -12,7 +12,9 @@ int yon_kernel_save(main_window *widgets){
overall_size++; overall_size++;
kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
yon_config_append_element(packages_parameter,row->package,","); char *append_str = yon_char_replace(row->modules," ",",");
yon_config_append_element(packages_parameter,append_str,",");
free(append_str);
active_size++; active_size++;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){
enabled_module = row->package; enabled_module = row->package;
@ -26,6 +28,18 @@ int yon_kernel_save(main_window *widgets){
yon_config_remove_by_key(KERNEL_BOOT_parameter); yon_config_remove_by_key(KERNEL_BOOT_parameter);
} }
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter, KERNEL_BOOT_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

@ -193,7 +193,7 @@ void yon_kernel_setup(main_window *widgets){
int modules_size; int modules_size;
config_str modules_parsed = NULL; config_str modules_parsed = NULL;
if (!yon_char_is_empty(modules)){ if (!yon_char_is_empty(modules)){
modules_parsed = yon_char_parse(modules,&modules_size," "); modules_parsed = yon_char_parse(modules,&modules_size,",");
} }
int size; int size;

@ -94,9 +94,9 @@ void yon_packages_tab_init(main_window *widgets){
GtkTreeIter catiter; GtkTreeIter catiter;
GtkTreeIter package_iter; GtkTreeIter package_iter;
gtk_tree_store_append(widgets->PackagesList,&catiter,NULL); gtk_tree_store_append(widgets->PackagesList,&catiter,NULL);
gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[3]),3,0,-1); gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[0]),3,0,-1);
gtk_tree_store_append(widgets->PackagesList,&subcategory_iter,&catiter); gtk_tree_store_append(widgets->PackagesList,&subcategory_iter,&catiter);
gtk_tree_store_set(widgets->PackagesList,&subcategory_iter,1,parsed[1],2,_(parsed[3]),3,0,-1); gtk_tree_store_set(widgets->PackagesList,&subcategory_iter,1,parsed[1],2,_(parsed[1]),3,0,-1);
gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcategory_iter); gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcategory_iter);
char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL); char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
gtk_tree_store_set(widgets->PackagesList,&package_iter,1,parsed[2],2,full_string,3,1,-1); gtk_tree_store_set(widgets->PackagesList,&package_iter,1,parsed[2],2,full_string,3,1,-1);
@ -105,7 +105,7 @@ void yon_packages_tab_init(main_window *widgets){
GtkTreeIter package_iter; GtkTreeIter package_iter;
GtkTreeIter catiter; GtkTreeIter catiter;
gtk_tree_store_append(widgets->PackagesList,&catiter,NULL); gtk_tree_store_append(widgets->PackagesList,&catiter,NULL);
gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[3]),3,0,-1); gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[0]),3,0,-1);
gtk_tree_store_append(widgets->PackagesList,&package_iter,&catiter); gtk_tree_store_append(widgets->PackagesList,&package_iter,&catiter);
char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL); char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1); gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1);

Loading…
Cancel
Save