diff options
| author | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2023-01-15 18:16:34 +0100 |
|---|---|---|
| committer | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2023-01-15 18:16:34 +0100 |
| commit | 37893004236be9c9885cec066e16c23b122d2ad1 (patch) | |
| tree | 7f416bd926c4076a3ec3c88aa92e2b1aed3fac31 | |
| parent | bfddad6582f4123023bb74d43f4cc7e3d68c16a9 (diff) | |
| download | debvm-37893004236be9c9885cec066e16c23b122d2ad1.tar.gz | |
Avoid unnecessary debugfs call
Reported-by: Helmut Grohne <helmut@subdivi.de>
| -rwxr-xr-x | bin/debvm-run | 9 |
1 files changed, 6 insertions, 3 deletions
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" |