From 9cd51bb13a9129be38d8b540be3c55006574494b Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sat, 30 Jun 2018 19:51:56 +0000 Subject: [PATCH] One path for qcow2 images --- appvm.sh | 1 + qemu/qemu.template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appvm.sh b/appvm.sh index aa9878b..fb7dc89 100755 --- a/appvm.sh +++ b/appvm.sh @@ -9,6 +9,7 @@ if [[ "$1" == "build" && "$2" != "" ]]; then mkdir -p bin sed "s;NIX_SYSTEM_PLACEHOLDER;${NIX_SYSTEM};" qemu/qemu.template > bin/appvm.${2} sed -i "s;NAME_PLACEHOLDER;${2};" bin/appvm.${2} + sed -i "s;NIX_DISK_IMAGE_PLACEHOLDER;${APPVM_PATH}/qemu/qcow2/${2}.qcow2;" bin/appvm.${2} chmod +x bin/appvm.${2} unlink result else diff --git a/qemu/qemu.template b/qemu/qemu.template index 3cb36f2..a9fc0d8 100644 --- a/qemu/qemu.template +++ b/qemu/qemu.template @@ -2,7 +2,7 @@ NAME=NAME_PLACEHOLDER -NIX_DISK_IMAGE=$(readlink -f ${NIX_DISK_IMAGE:-./${NAME}.qcow2}) +NIX_DISK_IMAGE=NIX_DISK_IMAGE_PLACEHOLDER if ! test -e "$NIX_DISK_IMAGE"; then qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1