diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/debvm-run | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/debvm-run b/bin/debvm-run index 6ed47c4..1b59158 100755 --- a/bin/debvm-run +++ b/bin/debvm-run @@ -195,8 +195,12 @@ case "$VMARCH" in ;; esac -KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat $KERNELLINK" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') -INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat initrd.img" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') +KERNELPREFIX="" +KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat $KERNELLINK") +test -n "$KERNELNAME" || KERNELPREFIX=boot/ + +KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat ${KERNELPREFIX}$KERNELLINK" | 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" test -n "$INITRDNAME" || die "failed to discover initrd image" @@ -286,7 +290,7 @@ set -- \ set -ex -/sbin/debugfs "$IMAGE" -R "cat $KERNELNAME" > "$KERNELTMP" -/sbin/debugfs "$IMAGE" -R "cat $INITRDNAME" > "$INITRDTMP" +/sbin/debugfs "$IMAGE" -R "cat ${KERNELPREFIX}$KERNELNAME" > "$KERNELTMP" +/sbin/debugfs "$IMAGE" -R "cat ${KERNELPREFIX}$INITRDNAME" > "$INITRDTMP" "$QEMU" "$@" |