Добвлена поддержка создания SafeMode initrd для различных ядер calculate

eclass/calculate-kernel-6.eclass

@@ -122,6 +122,7 @@ clean_for_minimal() {
 calculate-kernel-6_src_install() {
 	use vmlinuz && vmlinuz_src_install
 	use minimal && clean_for_minimal
+	touch ${D}/usr/src/linux-${KV_FULL}/.calculate
 	kernel-2_src_install
 	if ! use vmlinuz
 	then

profiles/templates/3.1/3_ac_install_live/1-live/sys-boot/grub/create_hostonly

@@ -4,12 +4,13 @@
 source /usr/share/grub/grub-mkconfig_lib
 
 get_latest_kernel() {
-    version_find_latest /boot/vmlinuz-*-calculate
+    version_find_latest /boot/vmlinuz-*
 }
 
 get_safemode_name() {
     local kernel=$1
-    echo ${kernel/-calculate/-SafeMode}
+    #echo ${kernel/-calculate/-SafeMode}
+    [[ $kernel =~ ^([^-]+-[^-]+)-(.*)$ ]] && echo "${BASH_REMATCH[1]}-SafeMode-${BASH_REMATCH[2]}" || echo ${kernel}
 }
 
 get_kernel_version() {
@@ -24,7 +25,8 @@ get_kernel_initramfs() {
 
 is_calculate_kernel() {
     local kernel=$1
-    [[ $kernel =~ -calculate$ ]]
+    local kernel_version=$(get_kernel_version $kernel)
+    [[ -f /usr/src/linux-${kernel_version} ]]
 }
 
 die() {