diff options
| -rwxr-xr-x | bin/debvm-run | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/debvm-run b/bin/debvm-run index 39928d2..ee94003 100755 --- a/bin/debvm-run +++ b/bin/debvm-run @@ -191,16 +191,17 @@ for KERNELLINK in vmlinuz vmlinux boot/vmlinuz boot/vmlinux; do KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat $KERNELLINK" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') test -n "$KERNELNAME" && break done -test -n "$KERNELNAME" || die "failed to discover kernel image" - -if test "${KERNELLINK#boot/}" = "$KERNELLINK"; then - INITRDLINK=initrd.img +if test "${KERNELLINK%/*}" = "$KERNELLINK"; then + BOOTDIR= else - INITRDLINK=boot/initrd.img + BOOTDIR="${KERNELLINK%/*}/" fi -INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat $INITRDLINK" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') +test -n "$KERNELNAME" || die "failed to discover kernel image" +test "${KERNELNAME#/}" = "$KERNELNAME" || KERNELNAME="$BOOTDIR$KERNELNAME" +INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat ${BOOTDIR}initrd.img" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d') test -n "$INITRDNAME" || die "failed to discover initrd image" +test "${INITRDNAME#/}" = "$INITRDNAME" || INITRDNAME="$BOOTDIR$INITRDNAME" KERNEL_CMDLINE="root=LABEL=debvm rw" NETDEV="user,id=net0" |