From 37893004236be9c9885cec066e16c23b122d2ad1 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 15 Jan 2023 18:16:34 +0100 Subject: Avoid unnecessary debugfs call Reported-by: Helmut Grohne --- bin/debvm-run | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/debvm-run b/bin/debvm-run index 1b59158..5740a02 100755 --- a/bin/debvm-run +++ b/bin/debvm-run @@ -196,10 +196,13 @@ case "$VMARCH" in esac KERNELPREFIX="" -KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat $KERNELLINK") -test -n "$KERNELNAME" || KERNELPREFIX=boot/ +KERNELLINKFILE=$(/sbin/debugfs "$IMAGE" -R "stat $KERNELLINK") +if test -z "$KERNELLINKFILE"; then + KERNELPREFIX=boot/ + KERNELLINKFILE=$(/sbin/debugfs "$IMAGE" -R "stat ${KERNELPREFIX}$KERNELLINK") +fi -KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat ${KERNELPREFIX}$KERNELLINK" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') +KERNELNAME=$(echo "$KERNELLINKFILE" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat ${KERNELPREFIX}initrd.img" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') test -n "$KERNELNAME" || die "failed to discover kernel image" -- cgit v1.2.3