Revert unneeded changes to kexec-boot and kexec-parse-boot

linuxboot · Mar 30, 2023 · 6459416 · 6459416
1 parent 8872b12
commit 6459416
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot
@@ -31,8 +31,6 @@ kexectype=`echo $entry | cut -d\| -f2`
 kexecparams=`echo $entry | cut -d\| -f3- | tr '|' '\n'`
 kexeccmd="kexec"
 
-DEBUG "kexectype= $kexectype"
-
 cmdadd="$CONFIG_BOOT_KERNEL_ADD $cmdadd"
 cmdremove="$CONFIG_BOOT_KERNEL_REMOVE $cmdremove"
 
@@ -64,7 +62,6 @@ adjust_cmd_line() {
 }
 
 module_number="1"
-
 while read line
 do
 	key=`echo $line | cut -d\  -f1`
@@ -82,11 +79,15 @@ do
 			kexeccmd="$kexeccmd --command-line \"$restval\""
 		elif [ "$kexectype" = "elf" ]; then
 			DEBUG "kexectype= $kexectype"
+			DEBUG "restval= $restval"
+			DEBUG "filepath= $filepath"
 			#kexeccmd="$kexeccmd --noefi --console-vga -l $filepath"
-			kexeccmd="$kexeccmd --noefi --reuse-video-type -l $filepath"
+			#kexeccmd="$kexeccmd --command-line \"$restval vga=current\"" 
 			#kexeccmd="$kexeccmd --noefi --reset-vga -l $filepath"
 			#kexeccmd="$kexeccmd --noefi --console-vga --reuse-video-type -l $filepath"
 			#kexeccmd="$kexeccmd --noefi --real-mode --console-vga --reuse-video-type -l $filepath"
+			#kexeccmd="$kexeccmd -l $filepath --command-line \"$restval vga=current\""
+			kexeccmd="$kexeccmd -l $filepath"		
 		else
 			kexeccmd="$kexeccmd -l $filepath"
 		fi

diff --git a/initrd/bin/kexec-parse-boot b/initrd/bin/kexec-parse-boot
@@ -85,9 +85,7 @@ search_entry() {
 		menuentry* | MENUENTRY* )
 			state="grub"
 			reset_entry
-			name=`echo $line |sed 's/\.\.\. //' | tr "'" "\"" | cut -d\" -f 2`
-			TRACE " search_entry: grub menuentry: line= $line"
-			TRACE " search_entry: grub menuentry: name= $name"
+			name=`echo $line | tr "'" "\"" | cut -d\" -f 2`
 			;;
 
 		label* | LABEL* )
@@ -133,9 +131,7 @@ grub_entry() {
 			# location.
 			DEBUG " grub_entry : linux trimcmd prior of kernel/append parsing: $trimcmd"
 			kernel=`echo $trimcmd | sed "s/([^)]*)//g" | cut -d\  -f2`
-			append=`echo $trimcmd | cut -d\  -f3- | sed 's/ ---//'`
-			DEBUG " grub_entry: linux kernel= $kernel"
-			DEBUG " grub_entry: linux append= $append"
+			append=`echo $trimcmd | cut -d\  -f3-`
 			;;
 		initrd*)
 			# Trim off device specification as above
@@ -225,7 +221,7 @@ syslinux_entry() {
 			if [ "$kexectype" = "multiboot" -o "$kexectype" = "xen" ]; then
 				syslinux_multiboot_append
 			else
-				append=`echo $val |sed 's/ ---//'`
+				append="$val"
 			fi
 			;;
 	esac