Skip to content

Commit faf9217

Browse files
fix(core): add swtpm configs and gnutls-utils to virt-launcher image (#819)
fix(core): add swtpm configs and gnutls-utils to virt-launcher image swtpm configs and gnutls-utils was added to virt-laucher, for correct launch windows vm and vm with UEFI --------- Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent acf12c8 commit faf9217

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

images/virt-launcher/werf.inc.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ packages:
129129
- ethtool
130130
- fdisk
131131
- glibc-gconv-modules
132+
- gnutls-utils
132133
- hwclock
133134
- iptables
134135
- libffi8
@@ -157,6 +158,12 @@ binaries:
157158
- /usr/bin/cut
158159
- /usr/bin/grep
159160
- /usr/bin/sync
161+
# Gnu utils (requared for swtpm)
162+
- /usr/bin/certtool
163+
- /usr/bin/gnutls-cli
164+
- /usr/bin/ocsptool
165+
- /usr/bin/p11tool
166+
- /usr/bin/psktool
160167
# Utilities for mount
161168
- /usr/bin/mount
162169
- /usr/bin/umount
@@ -294,7 +301,9 @@ shell:
294301
295302
apt-get clean
296303
297-
mkdir -p /VBINS/var/{log/libvirt/qemu,run/libvirt/qemu,lib/libvirt/qemu}
304+
echo "Create folder hierarchy in VBINS"
305+
mkdir -p /VBINS/{etc,root}
306+
mkdir -p /VBINS/var/{log/libvirt/qemu,log/swtpm/libvirt/qemu,lib/libvirt/qemu,run/libvirt/qemu}
298307
299308
echo "=====Copy libvirt binaries to temp folder======"
300309
cp -a /libvirt-bins/. /VBINS/
@@ -317,12 +326,14 @@ shell:
317326
setup:
318327
- |
319328
./relocate_binaries.sh -i "{{ $virtLauncherDependencies.binaries | join " " }}" -o /relocate
320-
321-
mkdir -p /relocate/{etc,root,var/run}
329+
330+
# Copy additional config swtpm
331+
cp -a /etc/{swtpm_setup.conf,swtpm-localca.conf,swtpm-localca.options} /relocate/etc/
332+
# Copy xattr config
333+
cp -a /etc/xattr.conf /relocate/etc
322334
323335
# glibc-gconv-modules
324336
cp -a /usr/lib64/gconv /relocate/usr/lib64
325-
cp /etc/xattr.conf /relocate/etc
326337
327338
echo "root:x:0:0:root:/root:/bin/bash" >> /relocate/etc/passwd
328339
echo "root:x:0:" >> /relocate/etc/group

0 commit comments

Comments
 (0)