From 5ee6d4d4e3275a8a0e151a9e09e2229bf906aba1 Mon Sep 17 00:00:00 2001 From: Betty Lakes Date: Thu, 4 Apr 2024 01:45:24 +0000 Subject: [PATCH 1/3] Remove systemd-bootstrap dependency in libvirt --- SPECS/libvirt/libvirt.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SPECS/libvirt/libvirt.spec b/SPECS/libvirt/libvirt.spec index d2d13eb23ba..7d560b36221 100644 --- a/SPECS/libvirt/libvirt.spec +++ b/SPECS/libvirt/libvirt.spec @@ -185,7 +185,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 10.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -397,9 +397,6 @@ Requires: polkit >= 0.112 # For virConnectGetSysinfo Requires: dmidecode %endif -# For service management -Requires(posttrans): /usr/bin/systemctl -Requires(preun): /usr/bin/systemctl # libvirtd depends on 'messagebus' service Requires: dbus # For uid creation during pre @@ -2184,6 +2181,9 @@ exit 0 %endif %changelog +* Wed Apr 03 2024 Betty Lakes - 10.0.0-2 +- Remove systemd-bootstrap dependency + * Thu Jan 18 2024 Brian Fjeldstad - 10.0.0-1 - Updating to version 10.0.0. - Hard code configuration options to match Mariner 2.0 configurations. Ensure that From dd94fae40f4239e0cdb428b31183c252c07f63d4 Mon Sep 17 00:00:00 2001 From: Betty <38226164+BettyRain@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:43:59 -0700 Subject: [PATCH 2/3] Add systemd dependency instead of systemd-bootstrap Co-authored-by: Daniel McIlvaney --- SPECS/libvirt/libvirt.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SPECS/libvirt/libvirt.spec b/SPECS/libvirt/libvirt.spec index 7d560b36221..03a5fa1f534 100644 --- a/SPECS/libvirt/libvirt.spec +++ b/SPECS/libvirt/libvirt.spec @@ -397,6 +397,10 @@ Requires: polkit >= 0.112 # For virConnectGetSysinfo Requires: dmidecode %endif +# For service management +# azl has systemd-bootstrap which also provides /usr/bin/sysctl, explicitly request full systemd. +Requires(posttrans): systemd +Requires(preun): systemd # libvirtd depends on 'messagebus' service Requires: dbus # For uid creation during pre From 87e8c4f4d022f4f96d602b23e8d79e1232206b55 Mon Sep 17 00:00:00 2001 From: Betty <38226164+BettyRain@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:47:35 -0700 Subject: [PATCH 3/3] Update comment in changelog Co-authored-by: Daniel McIlvaney --- SPECS/libvirt/libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/libvirt/libvirt.spec b/SPECS/libvirt/libvirt.spec index 03a5fa1f534..43d37976ff4 100644 --- a/SPECS/libvirt/libvirt.spec +++ b/SPECS/libvirt/libvirt.spec @@ -2186,7 +2186,7 @@ exit 0 %changelog * Wed Apr 03 2024 Betty Lakes - 10.0.0-2 -- Remove systemd-bootstrap dependency +- Make systemd dependency explicit to avoid confusion with systemd-bootstrap. * Thu Jan 18 2024 Brian Fjeldstad - 10.0.0-1 - Updating to version 10.0.0.