diff --git a/hpvd-Use-filename-for-connection-profile.patch b/hpvd-Use-filename-for-connection-profile.patch new file mode 100644 index 0000000..5ed2917 --- /dev/null +++ b/hpvd-Use-filename-for-connection-profile.patch @@ -0,0 +1,31 @@ +From 3d234bcdb4d40b42923688514a2fb5d1cb8b3314 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: Till Maas +RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands +RH-Commit: [2/2] 6b6f37ba159b0614b75fcfc02f0513af116711c2 (timaas/hyperv-daemons) +RH-Bugzilla: 2026371 +RH-Acked-by: Miroslav Rezanina +RH-Acked-by: Vitaly Kuznetsov +--- + 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/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch b/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch new file mode 100644 index 0000000..049dc16 --- /dev/null +++ b/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch @@ -0,0 +1,38 @@ +From ac2132ceaeb611c89eacb468a66f1815ee6fe806 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: Till Maas +RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands +RH-Commit: [1/2] fbb64255b1d96babd362391d53529cef0e449296 (timaas/hyperv-daemons) +RH-Bugzilla: 2026371 +RH-Acked-by: Miroslav Rezanina +RH-Acked-by: Vitaly Kuznetsov + +Instead of using deprecated ifup/ifdown commands, use nmcli commands. +Taking the connection down is not necessary with NM, so don't do it. + +Resolves: #2026371 +--- + 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/hyperv-daemons.spec b/hyperv-daemons.spec index bf1c639..c566a44 100644 --- a/hyperv-daemons.spec +++ b/hyperv-daemons.spec @@ -13,7 +13,7 @@ Name: hyperv-daemons Version: 0 -Release: 0.38%{?snapver}%{?dist} +Release: 0.39%{?snapver}%{?dist} Summary: Hyper-V daemons suite License: GPLv2 @@ -48,6 +48,10 @@ Patch0002: 0002-Do-not-set-NM_CONTROLLED-no.patch Patch0004: 0004-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch Patch0005: 0005-Add-vmbus_testing-tool-build-files.patch Patch0006: 0006-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch +# For bz#2026371 - [RHEL9][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update for RHEL9 since the ifdown/ifup was not supported on RHEL9 +Patch7: hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch +# For bz#2026371 - [RHEL9][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update for RHEL9 since the ifdown/ifup was not supported on RHEL9 +Patch8: hpvd-Use-filename-for-connection-profile.patch # Source-git patches # Hyper-V is available only on x86 and aarch64 architectures @@ -152,6 +156,8 @@ cp -pvL %{SOURCE301} lsvmbus %patch0004 -p1 %patch0005 -p1 %patch0006 -p1 +%patch7 -p1 +%patch8 -p1 %build # HYPERV KVP DAEMON @@ -269,6 +275,12 @@ fi %{_sbindir}/vmbus_testing %changelog +* Wed Dec 15 2021 Miroslav Rezanina - 0-0.39.20190303git +- hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch [bz#2026371] +- hpvd-Use-filename-for-connection-profile.patch [bz#2026371] +- Resolves: bz#2026371 + ([RHEL9][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update for RHEL9 since the ifdown/ifup was not supported on RHEL9) + * Mon Nov 08 2021 Miroslav Rezanina - 0-0.38.20190303git - hpvd-Enable-build-on-aarch64.patch [bz#2020148] - Resolves: bz#2020148