From b1972e4f388e4ebd58fa983e8fe3b42b36a839bb Mon Sep 17 00:00:00 2001 From: Bruno Veiga Date: Wed, 23 Oct 2024 08:02:02 -0300 Subject: [PATCH] Changing Kata-container files path. After a version update, some files where not present where they where meant to be ("/var/opt/kata/"). It was identified that the update process does not touch /var/. To solve this we changed the files location to "/usr/share/kata/". TEST PLAN: PASS: Success during version upgrade on AIO-SX, kata-containers folders in expected location. PASS: Success on deploying pod using kata-containers on AIO-SX. Closes-bug: #2085793 Change-Id: I3764a5df130e087fb4f7d9d00bc0e3f6408fdf6b Signed-off-by: Bruno Veiga --- .../debian/deb_folder/kata-containers.install | 28 +++++++++---------- ...1-patch-to-change-configuration-file.patch | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kata-containers/debian/deb_folder/kata-containers.install b/kata-containers/debian/deb_folder/kata-containers.install index 8ce4d0662..18a280192 100644 --- a/kata-containers/debian/deb_folder/kata-containers.install +++ b/kata-containers/debian/deb_folder/kata-containers.install @@ -4,17 +4,17 @@ opt/kata/bin/kata-collect-data.sh /usr/bin/ opt/kata/libexec/virtiofsd /usr/kata/libexec/ opt/kata/share/defaults/kata-containers/configuration-qemu.toml /etc/kata-containers/ opt/kata/share/defaults/kata-containers/configuration.toml /etc/kata-containers/ -opt/kata/share/kata-containers/config-5.10.25 /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/config-5.19.2 /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/kata-alpine-3.15.initrd /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/kata-ubuntu-latest.image /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/kata-containers-initrd.img /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/kata-containers.img /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinux-5.10.25-100-dragonball-experimental /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinux-5.19.2-100 /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinux-dragonball-experimental.container /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinux.container /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinuz-5.10.25-100-dragonball-experimental /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinuz-5.19.2-100 /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinuz-dragonball-experimental.container /var/opt/kata/share/kata-containers/ -opt/kata/share/kata-containers/vmlinuz.container /var/opt/kata/share/kata-containers/ +opt/kata/share/kata-containers/config-5.10.25 /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/config-5.19.2 /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/kata-alpine-3.15.initrd /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/kata-ubuntu-latest.image /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/kata-containers-initrd.img /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/kata-containers.img /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinux-5.10.25-100-dragonball-experimental /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinux-5.19.2-100 /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinux-dragonball-experimental.container /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinux.container /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinuz-5.10.25-100-dragonball-experimental /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinuz-5.19.2-100 /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinuz-dragonball-experimental.container /usr/share/kata/share/kata-containers/ +opt/kata/share/kata-containers/vmlinuz.container /usr/share/kata/share/kata-containers/ diff --git a/kata-containers/debian/patches/0001-patch-to-change-configuration-file.patch b/kata-containers/debian/patches/0001-patch-to-change-configuration-file.patch index 9966a8dfa..a09537fff 100644 --- a/kata-containers/debian/patches/0001-patch-to-change-configuration-file.patch +++ b/kata-containers/debian/patches/0001-patch-to-change-configuration-file.patch @@ -20,8 +20,8 @@ index d451b89..a23a85c 100644 -kernel = "/opt/kata/share/kata-containers/vmlinux.container" -image = "/opt/kata/share/kata-containers/kata-containers.img" +path = "/usr/bin/qemu-system-x86_64" -+kernel = "/var/opt/kata/share/kata-containers/vmlinux.container" -+image = "/var/opt/kata/share/kata-containers/kata-containers.img" ++kernel = "/usr/share/kata/share/kata-containers/vmlinux.container" ++image = "/usr/share/kata/share/kata-containers/kata-containers.img" # initrd = "/opt/kata/share/kata-containers/kata-containers-initrd.img" machine_type = "q35"