From d2a468f4aeff8f14b50db51d9df72ba1515a48c4 Mon Sep 17 00:00:00 2001
From: Ivan Dmitrievich Yartsev <yarcev.id@ublinux.ru>
Date: Tue, 10 Mar 2026 10:44:47 +0600
Subject: [PATCH] Fixed kernel loading

---
 locale/groups-list_ru.po          |  5 ++++-
 source/ubinstall-gtk-components.c | 16 +++++++++++++++-
 source/ubinstall-gtk-kernel.c     |  2 +-
 source/ubinstall-gtk-packages.c   |  6 +++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/locale/groups-list_ru.po b/locale/groups-list_ru.po
index 6fca439..a73eab0 100644
--- a/locale/groups-list_ru.po
+++ b/locale/groups-list_ru.po
@@ -132,7 +132,10 @@ msgid "Chromium and some plugins"
 msgstr "Chromium и некоторые другие плагины"
 
 msgid "Office"
-msgstr "Office"
+msgstr "Офис"
+
+msgid "Office packet"
+msgstr "Офисный пакет"
 
 msgid "Browser"
 msgstr "Браузер"
diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c
index 196115b..a1a3b6a 100644
--- a/source/ubinstall-gtk-components.c
+++ b/source/ubinstall-gtk-components.c
@@ -12,7 +12,9 @@ int yon_kernel_save(main_window *widgets){
         overall_size++;
         kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
         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++;
             if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){
                 enabled_module = row->package;
@@ -26,6 +28,18 @@ int yon_kernel_save(main_window *widgets){
         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;
 }
 
diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c
index 8b4e5e6..c5b7298 100644
--- a/source/ubinstall-gtk-kernel.c
+++ b/source/ubinstall-gtk-kernel.c
@@ -193,7 +193,7 @@ void yon_kernel_setup(main_window *widgets){
     int modules_size;
     config_str modules_parsed = NULL;
     if (!yon_char_is_empty(modules)){
-        modules_parsed = yon_char_parse(modules,&modules_size," ");
+        modules_parsed = yon_char_parse(modules,&modules_size,",");
     }
 
     int size;
diff --git a/source/ubinstall-gtk-packages.c b/source/ubinstall-gtk-packages.c
index ef3d1b9..bd062ea 100644
--- a/source/ubinstall-gtk-packages.c
+++ b/source/ubinstall-gtk-packages.c
@@ -94,9 +94,9 @@ void yon_packages_tab_init(main_window *widgets){
                 GtkTreeIter catiter;
                 GtkTreeIter package_iter;
                 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_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);
                 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);
@@ -105,7 +105,7 @@ void yon_packages_tab_init(main_window *widgets){
                 GtkTreeIter package_iter;
                 GtkTreeIter catiter;
                 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);
                 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);