rpms/hyperv-daemons
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Auto sync2gitlab import of hyperv-daemons-0-0.34.20180415git.el8.src.rpm

Browse Source
This commit is contained in:
CentOS Sources 2022-12-06 08:10:56 +00:00
parent d473247a44
commit 79ab77cd21
4 changed files with 165 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch Normal file
View File

@ -0,0 +1,46 @@
From 0a6bfc42945419eba5ed92c10ae722625a2ccb05 Mon Sep 17 00:00:00 2001
From: Mohammed Gamal <mgamal@redhat.com>
Date: Tue, 8 Nov 2022 16:20:17 +0100
Subject: [PATCH 1/3] redhat: hv_set_if_config: Workaround for gateway
numbering in NetworkManager
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
RH-MergeRequest: 4: redhat: hv_set_if_config: Workaround for gateway numbering in NetworkManager
RH-Bugzilla: 2142028
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RH-Acked-by: Cathy Avery <cavery@redhat.com>
RH-Commit: [1/1] 85b28bc13239a64b7a200ca4edb83ac5d0fe5ebd
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2142028
Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x.
So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged.
Workaround this by replacing GATEWAY= with GATEWAY0=.
A proper fix however, would be to generate NetworkManager keyfiles instead of ifcfg files.
That can be done eitter by changing hypervkvpd code to do that or to let the script parse
ifcfg files and generate corresponding NetworkManager keyfiles
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
hv_set_ifconfig.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
index 146829b..fe7fccf 100644
--- a/hv_set_ifconfig.sh
+++ b/hv_set_ifconfig.sh
@@ -54,6 +54,10 @@ echo "IPV6INIT=yes" >> $1
echo "PEERDNS=yes" >> $1
echo "ONBOOT=yes" >> $1
+#Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x.
+#So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged.
+#Workaround this by replacing GATEWAY= with GATEWAY0=.
+sed -i "s/GATEWAY=/GATEWAY0=/" $1
cp $1 /etc/sysconfig/network-scripts/
--
2.37.3

47
hpvd-tools-hv-Remove-an-extraneous-the.patch Normal file
View File

@ -0,0 +1,47 @@
From 2171b1e58d19b8af77aecc56fa7ce2529cb0ec97 Mon Sep 17 00:00:00 2001
From: Mohammed Gamal <mgamal@redhat.com>
Date: Thu, 17 Nov 2022 18:56:20 +0100
Subject: [PATCH 2/3] tools: hv: Remove an extraneous "the"
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
RH-MergeRequest: 5: Update hyperv-daemons for RHEL-8.8
RH-Bugzilla: 2139456
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [1/2] 7ae4fbcb80ed5795a43cbd355b8e8fe58ab78ba0
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139456
commit f15f39fabed2248311607445ddfa6dba63abebb9
Author: Jason Wang <wangborong@cdjrlc.com>
Date: Thu Aug 11 21:34:33 2022 +0800
tools: hv: Remove an extraneous "the"
There are two "the" in the text. Remove one.
Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
Link: https://lore.kernel.org/r/20220811133433.10175-1-wangborong@cdjrlc.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
hv_kvp_daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
index 1e6fd6c..c97c12e 100644
--- a/hv_kvp_daemon.c
+++ b/hv_kvp_daemon.c
@@ -44,7 +44,7 @@
/*
* KVP protocol: The user mode component first registers with the
- * the kernel component. Subsequently, the kernel component requests, data
+ * kernel component. Subsequently, the kernel component requests, data
* for the specified keys. In response to this message the user mode component
* fills in the value corresponding to the specified key. We overload the
* sequence field in the cn_msg header to define our KVP message types.
--
2.37.3

53
hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch Normal file
View File

@ -0,0 +1,53 @@
From 0452c1c7a5f5f27aebefcc2816f3781c7bbb55e2 Mon Sep 17 00:00:00 2001
From: Mohammed Gamal <mgamal@redhat.com>
Date: Thu, 17 Nov 2022 18:58:31 +0100
Subject: [PATCH 3/3] tools: hv: kvp: remove unnecessary (void*) conversions
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
RH-MergeRequest: 5: Update hyperv-daemons for RHEL-8.8
RH-Bugzilla: 2139456
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Commit: [2/2] 739e447d4cff82f47cb60a14d8bd87ca3601a59b
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139456
commit 2258954234db7530e9d86bb32cd6ad54485ff926
Author: Zhou jie <zhoujie@nfschina.com>
Date: Tue Aug 23 11:45:52 2022 +0800
tools: hv: kvp: remove unnecessary (void*) conversions
Remove unnecessary void* type casting.
Signed-off-by: Zhou jie <zhoujie@nfschina.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20220823034552.8596-1-zhoujie@nfschina.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
hv_kvp_daemon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
index c97c12e..27f5e7d 100644
--- a/hv_kvp_daemon.c
+++ b/hv_kvp_daemon.c
@@ -772,11 +772,11 @@ static int kvp_process_ip_address(void *addrp,
const char *str;
if (family == AF_INET) {
- addr = (struct sockaddr_in *)addrp;
+ addr = addrp;
str = inet_ntop(family, &addr->sin_addr, tmp, 50);
addr_length = INET_ADDRSTRLEN;
} else {
- addr6 = (struct sockaddr_in6 *)addrp;
+ addr6 = addrp;
str = inet_ntop(family, &addr6->sin6_addr.s6_addr, tmp, 50);
addr_length = INET6_ADDRSTRLEN;
}
--
2.37.3

20
hyperv-daemons.spec
View File

@ -13,7 +13,7 @@
Name: hyperv-daemons
Version: 0
Release: 0.33%{?snapver}%{?dist}
Release: 0.34%{?snapver}%{?dist}
Summary: Hyper-V daemons suite
Group: System Environment/Daemons
@ -66,6 +66,12 @@ Patch7: hpvd-Use-filename-for-connection-profile.patch
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#2142028 - [Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0
Patch10: hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
# For bz#2139456 - [Hyper-V][RHEL8.8] Update Hyper-V-Daemons
Patch11: hpvd-tools-hv-Remove-an-extraneous-the.patch
# For bz#2139456 - [Hyper-V][RHEL8.8] Update Hyper-V-Daemons
Patch12: hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch
# For bz#2020141 - [Hyper-V][RHEL8.6][ARM64] No hyperv-daemons package built for aarch64 platform
# Patch6: hpvd-Enable-build-on-aarch64.patch
@ -182,6 +188,9 @@ cp -pvL %{SOURCE4} hv_set_ifconfig.sh
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%build
# HYPERV KVP DAEMON
@ -299,6 +308,15 @@ fi
%{_sbindir}/vmbus_testing
%changelog
* Fri Dec 02 2022 Jon Maloy <jmaloy@redhat.com> - 0-0.34.20180415git
- hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch [bz#2142028]
- hpvd-tools-hv-Remove-an-extraneous-the.patch [bz#2139456]
- hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch [bz#2139456]
- Resolves: bz#2142028
([Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0)
- Resolves: bz#2139456
([Hyper-V][RHEL8.8] Update Hyper-V-Daemons)
* Tue Aug 16 2022 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.33.20180415git
- hpvd-hypervkvpd.service-ordering-fixes.patch [bz#2115761]
- hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch [bz#2115761]