Merge pull request #1436 from tlaurion/kexec_cosmetic_fixes

Kexec cosmetic fixes
linuxboot · Jul 7, 2023 · 473c235 · 473c235
2 parents 3747d58 + a324724
commit 473c235
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot
@@ -146,6 +146,17 @@ echo "$kexeccmd"
 eval "$kexeccmd" \
 || die "Failed to load the new kernel"
 
+if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then
+	#Repeat kexec command that will be executed since in debug
+	DEBUG "kexeccmd= $kexeccmd"
+
+	read -n 1 -p "[DEBUG] Continue booting? [Y/n]: " debug_boot_confirm
+	if [ "${debug_boot_confirm^^}" = N ]; then
+		# abort
+		die "Boot aborted"
+	fi
+fi
+
 if [ "$CONFIG_TPM" = "y" ]; then
 	tpmr kexec_finalize
 fi

diff --git a/initrd/bin/kexec-insert-key b/initrd/bin/kexec-insert-key
@@ -68,6 +68,7 @@ if [ "$unseal_failed" = "y" ]; then
 	fi
 fi
 
+echo 
 echo '+++ Building initrd'
 # pad the initramfs (dracut doesn't pad the last gz blob)
 # without this the kernel init/initramfs.c fails to read

diff --git a/patches/kexec-2.0.26.patch b/patches/kexec-2.0.26.patch
@@ -83,8 +83,8 @@ index 14263b0..55291d6 100644
 +                dbgprintf("%s: Reusing video type %d\n",
 +                    __func__, real_mode->orig_video_isVGA);
  	} else {
-+                dbgprintf("%s: Unknown driver %s, can't provide framebuffer\n",
-+                    __func__, fix.id);
++                fprintf(stderr, "Unknown driver %s, can't provide framebuffer\n kexec'ed OS will take over console only if %s is provided\n",
++                    fix.id, fix.id);
  		real_mode->orig_video_isVGA = 0;
  		close(fd);
  		return 0;
@@ -95,7 +95,7 @@ index 14263b0..55291d6 100644
 +            dbgprintf("%s: Kernel did not provide framebuffer address\n",
 +                __func__);
 +            dbgprintf("%s: Try enabling CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM and "
-+                "drm_kms_helper.drm_leak_fbdev_smem\n",
++                "drm_kms_helper.drm_leak_fbdev_smem in kernel command-line options\n",
 +                __func__);
 +        }
 +