From 960619bf17ea346173206bfb833c03a5d0132a0f0cf13b66431aa1bfd2b1a80c Mon Sep 17 00:00:00 2001 From: Vasily Ulyanov Date: Wed, 6 Mar 2024 12:02:50 +0000 Subject: [PATCH] Accepting request 1155540 from home:vulyanov:branches:Virtualization - Use predefined configuration files for libvirt OBS-URL: https://build.opensuse.org/request/show/1155540 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-launcher-container?expand=0&rev=52 --- Dockerfile | 12 ++---------- augconf | 25 ------------------------- virt-launcher-container.changes | 5 +++++ 3 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 augconf diff --git a/Dockerfile b/Dockerfile index 42de39e..7a47c31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,16 +66,8 @@ RUN if [ "$(uname -m)" = "aarch64" ]; then \ ln -s ../qemu/aavmf-aarch64-vars.bin /usr/share/AAVMF/AAVMF_VARS.fd ; \ fi -COPY augconf /augconf -RUN zypper -n install \ - augeas \ - augeas-lenses && \ - augtool --echo -f /augconf && \ - zypper -n remove \ - augeas \ - augeas-lenses && \ - zypper clean -a && \ - rm -f /augconf +RUN cp -f /usr/share/kube-virt/virt-launcher/virtqemud.conf /etc/libvirt/virtqemud.conf && \ + cp -f /usr/share/kube-virt/virt-launcher/qemu.conf /etc/libvirt/qemu.conf # KubeVirt expects virtiofsd to be installed in /usr/libexec # NOTE: the value of %{_libexecdir} may vary across distros diff --git a/augconf b/augconf deleted file mode 100644 index 2ffcd3e..0000000 --- a/augconf +++ /dev/null @@ -1,25 +0,0 @@ -# Send debug logs to stderr -set /files/etc/libvirt/virtqemud.conf/log_outputs 1:stderr - -# Listen on all interfaces for now -set /files/etc/libvirt/qemu.conf/stdio_handler logd -set /files/etc/libvirt/qemu.conf/spice_listen 0.0.0.0 -set /files/etc/libvirt/qemu.conf/vnc_listen 0.0.0.0 -set /files/etc/libvirt/qemu.conf/vnc_tls 0 -set /files/etc/libvirt/qemu.conf/vnc_sasl 0 - -# Fixate user and group -set /files/etc/libvirt/qemu.conf/user qemu -set /files/etc/libvirt/qemu.conf/group qemu -set /files/etc/libvirt/qemu.conf/dynamic_ownership 1 -set /files/etc/libvirt/qemu.conf/remember_owner 0 - -# Workaround libvirt bug in /dev/ handling -set /files/etc/libvirt/qemu.conf/namespaces -set /files/etc/libvirt/qemu.conf/cgroup_controllers - -# Have virtlogd log to stderr -set /files/etc/libvirt/virtlogd.conf/log_outputs 2:stderr - -# Important to save -save diff --git a/virt-launcher-container.changes b/virt-launcher-container.changes index f68bac8..b17a7fe 100644 --- a/virt-launcher-container.changes +++ b/virt-launcher-container.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 6 08:16:34 UTC 2024 - Vasily Ulyanov + +- Use predefined configuration files for libvirt + ------------------------------------------------------------------- Fri Feb 23 08:53:39 UTC 2024 - Vasily Ulyanov