diff --git a/SOURCES/hpvd-Use-filename-for-connection-profile.patch b/SOURCES/hpvd-Use-filename-for-connection-profile.patch new file mode 100644 index 0000000..a73ec4f --- /dev/null +++ b/SOURCES/hpvd-Use-filename-for-connection-profile.patch @@ -0,0 +1,36 @@ +From c04d9b584862ee913720632d7fdf83b79525a7d3 Mon Sep 17 00:00:00 2001 +From: Till Maas +Date: Tue, 14 Dec 2021 08:07:40 +0000 +Subject: [PATCH 2/2] Use filename for connection profile + +RH-Author: Mohamed Gamal Morsy +RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands +RH-Commit: [2/2] 1b69f98b9c30ee6904475b78f2b93fabe2131074 +RH-Bugzilla: 2056566 +RH-Acked-by: Miroslav Rezanina +RH-Acked-by: Vitaly Kuznetsov + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2056566 + +Signed-off-by: Till Maas +Signed-off-by: Mohammed Gamal +--- + hv_set_ifconfig.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh +index 5a64efe..146829b 100644 +--- a/hv_set_ifconfig.sh ++++ b/hv_set_ifconfig.sh +@@ -57,5 +57,6 @@ echo "ONBOOT=yes" >> $1 + + cp $1 /etc/sysconfig/network-scripts/ + +-nmcli connection load "/etc/sysconfig/network-scripts/$1" +-nmcli connection up filename "/etc/sysconfig/network-scripts/$1" ++filename="${1##*/}" ++nmcli connection load "/etc/sysconfig/network-scripts/${filename}" ++nmcli connection up filename "/etc/sysconfig/network-scripts/${filename}" +-- +2.27.0 + diff --git a/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch b/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch new file mode 100644 index 0000000..2b6a10b --- /dev/null +++ b/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch @@ -0,0 +1,41 @@ +From 2db75ec41c2e346af992f9c00f2e90ed9fec694b Mon Sep 17 00:00:00 2001 +From: Till Maas +Date: Mon, 13 Dec 2021 16:08:42 +0000 +Subject: [PATCH 1/2] hv_set_ifconfig.sh: Use nmcli commands + +RH-Author: Mohamed Gamal Morsy +RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands +RH-Commit: [1/2] c045f4c849a7d8841c8ad4b6e4ba63abfb946187 +RH-Bugzilla: 2056566 +RH-Acked-by: Miroslav Rezanina +RH-Acked-by: Vitaly Kuznetsov + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2056566 + +Instead of using deprecated ifup/ifdown commands, use nmcli commands. +Taking the connection down is not necessary with NM, so don't do it. + +Signed-off-by: Till Maas +Signed-off-by: Mohammed Gamal +--- + hv_set_ifconfig.sh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh +index 3dd064c..5a64efe 100644 +--- a/hv_set_ifconfig.sh ++++ b/hv_set_ifconfig.sh +@@ -57,8 +57,5 @@ echo "ONBOOT=yes" >> $1 + + cp $1 /etc/sysconfig/network-scripts/ + +- +-interface=$(echo $1 | awk -F - '{ print $2 }') +- +-/sbin/ifdown $interface 2>/dev/null +-/sbin/ifup $interface 2>/dev/null ++nmcli connection load "/etc/sysconfig/network-scripts/$1" ++nmcli connection up filename "/etc/sysconfig/network-scripts/$1" +-- +2.27.0 + diff --git a/SOURCES/hpvd-hypervkvpd.service-ordering-fixes.patch b/SOURCES/hpvd-hypervkvpd.service-ordering-fixes.patch new file mode 100644 index 0000000..ee9cdb7 --- /dev/null +++ b/SOURCES/hpvd-hypervkvpd.service-ordering-fixes.patch @@ -0,0 +1,54 @@ +From 33725de60efa5e867ed73d2404d316785d0e4bb5 Mon Sep 17 00:00:00 2001 +From: Mohammed Gamal +Date: Wed, 20 Jul 2022 11:48:40 +0200 +Subject: [PATCH 1/2] hypervkvpd.service: ordering fixes + +RH-Author: Mohamed Gamal Morsy +RH-MergeRequest: 3: hypervkvpd.service: ordering fixes +RH-Commit: [1/2] f5bec088f7cf4afd641a2d7184a4e29cd1734bf4 +RH-Bugzilla: 2115761 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Cathy Avery + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115761 + + From 8dcff588c8eb1ab3119c6b0acead03189814b955 Mon Sep 17 00:00:00 2001 + From: Chris Patterson + Date: Jul 01 2022 14:36:25 +0000 + Subject: hypervkvpd.service: ordering fixes + + - Only start kvpd under Hyper-V. + + - Minimize dependencies for kvpd by removing the unnecessary + network.target requirement, but add kvp device and mount + requirements. + + Start before cloud-init-local.service which relies on kvpd + for Azure. + + Signed-off-by: Chris Patterson + +Signed-off-by: Mohammed Gamal +--- + hypervkvpd.service | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/hypervkvpd.service b/hypervkvpd.service +index 36ee11c..40dff13 100644 +--- a/hypervkvpd.service ++++ b/hypervkvpd.service +@@ -1,7 +1,10 @@ + [Unit] + Description=Hyper-V KVP daemon ++ConditionVirtualization=microsoft + BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device +-After=network.target ++After=sys-devices-virtual-misc-vmbus\x21hv_kvp.device ++RequiresMountsFor=/var/lib/hyperv ++Before=cloud-init-local.service + IgnoreOnIsolate=1 + + [Service] +-- +2.31.1 + diff --git a/SOURCES/hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch b/SOURCES/hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch new file mode 100644 index 0000000..d9a23f7 --- /dev/null +++ b/SOURCES/hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch @@ -0,0 +1,49 @@ +From 3eb64f25afdf65d9999d155d8c89327cf9d27036 Mon Sep 17 00:00:00 2001 +From: Mohammed Gamal +Date: Mon, 15 Aug 2022 17:38:37 +0200 +Subject: [PATCH 2/2] redhat: Add ConditionalVirtualization to the rest of + systemd units + +RH-Author: Mohamed Gamal Morsy +RH-MergeRequest: 3: hypervkvpd.service: ordering fixes +RH-Commit: [2/2] 6638ac3cfcff63e664d6ba86772a4bdfe45d2084 +RH-Bugzilla: 2115761 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Cathy Avery + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115761 + +Add ConditionalVirtualization to the rest of systemd units to make sure +they're started when running in Azure/Hyper-V. + +Signed-off-by: Mohammed Gamal +--- + hypervfcopyd.service | 1 + + hypervvssd.service | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/hypervfcopyd.service b/hypervfcopyd.service +index dd14a97..aab4b6b 100644 +--- a/hypervfcopyd.service ++++ b/hypervfcopyd.service +@@ -1,5 +1,6 @@ + [Unit] + Description=Hyper-V FCOPY daemon ++ConditionVirtualization=microsoft + BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device + IgnoreOnIsolate=1 + +diff --git a/hypervvssd.service b/hypervvssd.service +index 1e5ff43..6a0fad0 100644 +--- a/hypervvssd.service ++++ b/hypervvssd.service +@@ -1,5 +1,6 @@ + [Unit] + Description=Hyper-V VSS daemon ++ConditionVirtualization=microsoft + BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device + IgnoreOnIsolate=1 + +-- +2.31.1 + diff --git a/SPECS/hyperv-daemons.spec b/SPECS/hyperv-daemons.spec index 95c1b20..c97a62e 100644 --- a/SPECS/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons.spec @@ -13,7 +13,7 @@ Name: hyperv-daemons Version: 0 -Release: 0.31%{?snapver}%{?dist} +Release: 0.33%{?snapver}%{?dist} Summary: Hyper-V daemons suite Group: System Environment/Daemons @@ -58,6 +58,14 @@ Patch3: hvd-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch Patch4: hvd-Add-vmbus_testing-tool-build-files.patch # For bz#1886104 - [Hyper-V][RHEL8.4] Update Hyper-V-Daemons Patch5: hvd-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch +# For bz#2056566 - [RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8 +Patch6: hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch +# For bz#2056566 - [RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8 +Patch7: hpvd-Use-filename-for-connection-profile.patch +# For bz#2115761 - [Hyper-V][RHEL-8] hypervkvpd.service service ordering +Patch8: hpvd-hypervkvpd.service-ordering-fixes.patch +# For bz#2115761 - [Hyper-V][RHEL-8] hypervkvpd.service service ordering +Patch9: hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch # For bz#2020141 - [Hyper-V][RHEL8.6][ARM64] No hyperv-daemons package built for aarch64 platform # Patch6: hpvd-Enable-build-on-aarch64.patch @@ -170,6 +178,10 @@ cp -pvL %{SOURCE4} hv_set_ifconfig.sh %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build # HYPERV KVP DAEMON @@ -287,6 +299,18 @@ fi %{_sbindir}/vmbus_testing %changelog +* Tue Aug 16 2022 Miroslav Rezanina - 0-0.33.20180415git +- hpvd-hypervkvpd.service-ordering-fixes.patch [bz#2115761] +- hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch [bz#2115761] +- Resolves: bz#2115761 + ([Hyper-V][RHEL-8] hypervkvpd.service service ordering) + +* Tue Mar 22 2022 Jon Maloy - 0-0.32.20180415git.el8 +- hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch [bz#2065202] +- hpvd-Use-filename-for-connection-profile.patch [bz#2065202] +- Resolves: bz#2065202 + ([RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8 [rhel-8.7.0]) + * Wed Nov 10 2021 Jon Maloy - 0-0.31.20180415git.el8 - hpvd-Enable-build-on-aarch64.patch [bz#2020141] - Resolves: bz#2020141