Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virt-launcher-container for
openSUSE:Factory checked in at 2024-02-28 19:47:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-launcher-container (Old)
and /work/SRC/openSUSE:Factory/.virt-launcher-container.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-launcher-container"
Wed Feb 28 19:47:04 2024 rev:29 rq:1152837 version:unknown
Changes:
--------
---
/work/SRC/openSUSE:Factory/virt-launcher-container/virt-launcher-container.changes
2024-01-03 14:54:08.470179660 +0100
+++
/work/SRC/openSUSE:Factory/.virt-launcher-container.new.1770/virt-launcher-container.changes
2024-02-28 19:47:22.074351358 +0100
@@ -1,0 +2,7 @@
+Fri Feb 23 08:53:39 UTC 2024 - Vasily Ulyanov <vasily.ulya...@suse.com>
+
+- Handle various virtiofsd install paths (bsc#1219772)
+- Group together arch specific parts of the code
+- Cleanup after writing config files with augtool
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Dockerfile ++++++
--- /var/tmp/diff_new_pack.U0V2XZ/_old 2024-02-28 19:47:22.626371440 +0100
+++ /var/tmp/diff_new_pack.U0V2XZ/_new 2024-02-28 19:47:22.630371585 +0100
@@ -25,8 +25,6 @@
# endlabelprefix
RUN zypper -n install \
- augeas \
- augeas-lenses \
curl \
ethtool \
gawk \
@@ -49,43 +47,42 @@
#!ArchExclusiveLine: x86_64
RUN if [ "$(uname -m)" = "x86_64" ]; then \
- zypper -n install qemu-x86 ; \
- fi;
-
-#!ArchExclusiveLine: aarch64
-RUN if [ "$(uname -m)" = "aarch64" ]; then \
- zypper -n install \
- qemu-arm \
- qemu-uefi-aarch64 ; \
- fi;
-
-RUN zypper clean -a
-
-#!ArchExclusiveLine: x86_64
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
+ zypper -n install qemu-x86 && \
mkdir -p /usr/share/OVMF && \
ln -s ../qemu/ovmf-x86_64-code.bin /usr/share/OVMF/OVMF_CODE.fd && \
ln -s ../qemu/ovmf-x86_64-vars.bin /usr/share/OVMF/OVMF_VARS.fd && \
ln -s ../qemu/ovmf-x86_64-code.bin /usr/share/OVMF/OVMF_CODE.cc.fd && \
ln -s ../qemu/ovmf-x86_64-smm-ms-code.bin
/usr/share/OVMF/OVMF_CODE.secboot.fd && \
ln -s ../qemu/ovmf-x86_64-smm-ms-vars.bin
/usr/share/OVMF/OVMF_VARS.secboot.fd ; \
- fi;
+ fi
#!ArchExclusiveLine: aarch64
RUN if [ "$(uname -m)" = "aarch64" ]; then \
+ zypper -n install \
+ qemu-arm \
+ qemu-uefi-aarch64 && \
mkdir -p /usr/share/AAVMF && \
ln -s ../qemu/aavmf-aarch64-code.bin /usr/share/AAVMF/AAVMF_CODE.fd &&
\
ln -s ../qemu/aavmf-aarch64-vars.bin /usr/share/AAVMF/AAVMF_VARS.fd ; \
- fi;
-
-# KubeVirt expects virtiofsd to be installed in /usr/libexec
-RUN ls /usr/libexec/virtiofsd || \
- (mkdir -p /usr/libexec && ln -s ../lib/virtiofsd /usr/libexec/virtiofsd)
+ 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 augtool -f /augconf
-RUN cd /var && rm -rf run && ln -s ../run .
+# KubeVirt expects virtiofsd to be installed in /usr/libexec
+# NOTE: the value of %{_libexecdir} may vary across distros
+RUN VIRTIOFSD=$(rpm --eval '%{_libexecdir}')/virtiofsd; \
+ [ -d ${VIRTIOFSD} ] && VIRTIOFSD=${VIRTIOFSD}/virtiofsd; \
+ [ -f /usr/libexec/virtiofsd ] || \
+ (mkdir -p /usr/libexec && ln -svrt /usr/libexec ${VIRTIOFSD})
# Setup permissions and capabilities for non-root VMIs
RUN setcap 'cap_net_bind_service=+ep' /usr/bin/virt-launcher && \
@@ -93,5 +90,7 @@
setcap 'cap_net_bind_service=+ep' /usr/bin/qemu-system-$(uname -m) && \
chmod 0755 /etc/libvirt
+RUN cd /var && rm -rf run && ln -s ../run .
+
ENTRYPOINT [ "/usr/bin/virt-launcher-monitor" ]
