From 8e9ffe6f3aca1b38e0949d798e7a2da6b72e5a8c Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Tue, 27 Jul 2021 18:39:14 +0200 Subject: [PATCH] snap: Substitute image configuration with initrd rather than removing the other line because configuration only contains the image line ever more and this is how we already do it in tests. Fixes: #2330 Signed-off-by: Jakob Naucke --- snap/snapcraft.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0b71ba4c74..89c62180d5 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -169,12 +169,9 @@ parts: SKIP_GO_VERSION_CHECK=1 \ QEMUCMD=qemu-system-$arch - if [ -e ${SNAPCRAFT_PART_INSTALL}/../../image/install/usr/share/kata-containers/kata-containers.img ]; then - # Use rootfs image by default - sed -i -e '/^initrd =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml - else - # Use initrd by default - sed -i -e '/^image =/d' ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml + if [ ! -f ${SNAPCRAFT_PART_INSTALL}/../../image/install/usr/share/kata-containers/kata-containers.img ]; then + sed -i -e "s|^image =.*|initrd = \"/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr/share/kata-containers/kata-containers-initrd.img\"|" \ + ${SNAPCRAFT_PART_INSTALL}/usr/share/defaults/${SNAPCRAFT_PROJECT_NAME}/configuration.toml fi kernel: