Merge pull request #64 from nathanchance/revert-exec-uml

nathanchance · web-flow · commit 7eaecee7018e · 2022-06-04T06:58:17.000-07:00
-off-by: Nathan Chancellor &lt;nathan@kernel.org&gt;
diff --git a/boot-uml.sh b/boot-uml.sh
@@ -30,10 +30,7 @@ function decomp_rootfs() {
 }
 
 function execute_kernel() {
-    # exec is needed to avoid a "Killed" message when the kernel shuts down:
-    # https://github.com/ClangBuiltLinux/boot-utils/issues/60
-    # Nothing runs after this command so it is okay for it to replace this process.
-    exec "$KERNEL" ubd0="$rootfs" "${kernel_args[@]}"
+    "$KERNEL" ubd0="$rootfs" "${kernel_args[@]}"
 }
 
 parse_parameters "$@"

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,7 @@ function decomp_rootfs() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`function execute_kernel() {`
`33`		`- # exec is needed to avoid a "Killed" message when the kernel shuts down:`
`34`		`- # https://github.com/ClangBuiltLinux/boot-utils/issues/60`
`35`		`- # Nothing runs after this command so it is okay for it to replace this process.`
`36`		`- exec "$KERNEL" ubd0="$rootfs" "${kernel_args[@]}"`
	`33`	`+ "$KERNEL" ubd0="$rootfs" "${kernel_args[@]}"`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`parse_parameters "$@"`