| Message ID | 20211208160935.157897-1-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [isar-cip-core] start-qemu.sh: Add option to start a wic.img | expand |
On 08.12.21 17:09, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > To test image created for swupdate the resulting wic image needs > to be boot by qemu. > > Also fix indentation. > > This fixes issue [18]: > > [18]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/18 > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > start-qemu.sh | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/start-qemu.sh b/start-qemu.sh > index c700974..4ab3861 100755 > --- a/start-qemu.sh > +++ b/start-qemu.sh > @@ -22,6 +22,8 @@ usage() > > if grep -s -q "IMAGE_SECURE_BOOT: true" .config.yaml; then > SECURE_BOOT="true" > +elif grep -s -q "IMAGE_SWUPDATE: true" .config.yaml; then > + SWUPDATE_BOOT="true" > fi > > if [ -n "${QEMU_PATH}" ]; then > @@ -42,7 +44,7 @@ if [ -z "${TARGET_IMAGE}" ];then > TARGET_IMAGE="cip-core-image" > if grep -s -q "IMAGE_SECURITY: true" .config.yaml; then > TARGET_IMAGE="cip-core-image-security" > - fi > + fi > if [ -n "${SECURE_BOOT}" ]; then > TARGET_IMAGE="cip-core-image-read-only" > fi > @@ -58,7 +60,7 @@ case "$1" in > -machine q35,accel=kvm:tcg \ > -device virtio-net-pci,netdev=net" > if [ -n "${SECURE_BOOT}" ]; then > - # set bootindex=0 to boot disk instead of EFI-shell > + # set bootindex=0 to boot disk instead of EFI-shell > QEMU_EXTRA_ARGS=" \ > ${QEMU_EXTRA_ARGS} -device ide-hd,drive=disk,bootindex=0" > else > @@ -127,6 +129,9 @@ if [ -n "${SECURE_BOOT}" ]; then > BOOT_FILES="-drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \ > -drive if=pflash,format=raw,file=${ovmf_vars} \ > -drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw" > +elif [ -n "${SWUPDATE_BOOT}" ]; then > + BOOT_FILES="-drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw \ > + -bios OVMF.fd " > else > IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img) > > Thanks, applied. Jan
diff --git a/start-qemu.sh b/start-qemu.sh index c700974..4ab3861 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -22,6 +22,8 @@ usage() if grep -s -q "IMAGE_SECURE_BOOT: true" .config.yaml; then SECURE_BOOT="true" +elif grep -s -q "IMAGE_SWUPDATE: true" .config.yaml; then + SWUPDATE_BOOT="true" fi if [ -n "${QEMU_PATH}" ]; then @@ -42,7 +44,7 @@ if [ -z "${TARGET_IMAGE}" ];then TARGET_IMAGE="cip-core-image" if grep -s -q "IMAGE_SECURITY: true" .config.yaml; then TARGET_IMAGE="cip-core-image-security" - fi + fi if [ -n "${SECURE_BOOT}" ]; then TARGET_IMAGE="cip-core-image-read-only" fi @@ -58,7 +60,7 @@ case "$1" in -machine q35,accel=kvm:tcg \ -device virtio-net-pci,netdev=net" if [ -n "${SECURE_BOOT}" ]; then - # set bootindex=0 to boot disk instead of EFI-shell + # set bootindex=0 to boot disk instead of EFI-shell QEMU_EXTRA_ARGS=" \ ${QEMU_EXTRA_ARGS} -device ide-hd,drive=disk,bootindex=0" else @@ -127,6 +129,9 @@ if [ -n "${SECURE_BOOT}" ]; then BOOT_FILES="-drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \ -drive if=pflash,format=raw,file=${ovmf_vars} \ -drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw" +elif [ -n "${SWUPDATE_BOOT}" ]; then + BOOT_FILES="-drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw \ + -bios OVMF.fd " else IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img)