mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-01 01:00:15 +00:00
Code Issues Projects Releases Wiki Activity

arm-autonomy/xen-tools: update vif hostname fix patch status

Browse Source 
Fix for hostname setting in vif-nat script was merged in xen upstream repo,
(sha: 5499e0fc8082024bf7e2d0facd5c976e82105070),
hence correct patch status for 4.14 is 'Backport'.

Issue-Id: SCM-1523
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: I35f04bfa0f0fff81a1ef20d500b9323e5f13b9ed
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Kamil Dziezyk
2020-12-08 11:17:13 +01:00
committed by Jon Mason
parent afa281b7a9
commit 780fba3481
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
+24 -8
View File
@@ -1,18 +1,34 @@
Upstream-Status: Pending Upstream-Status: Backport
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
From 5499e0fc8082024bf7e2d0facd5c976e82105070 Mon Sep 17 00:00:00 2001
From: Diego Sueiro <diego.sueiro@arm.com>
Date: Thu, 20 Aug 2020 11:58:20 +0100
Subject: [PATCH] tools/hotplug: Fix hostname setting in vif-nat
Setting the hostname is failing because the "$XENBUS_PATH/domain" Setting the hostname is failing because the "$XENBUS_PATH/domain"
doesn't exist anymore. To fix this we set it to dom$domid doesn't exist anymore. To fix this we set it to dom$domid
Index: git/tools/hotplug/Linux/vif-nat Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
=================================================================== Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
--- git.orig/tools/hotplug/Linux/vif-nat Acked-by: Wei Liu <wl@xen.org>
+++ git/tools/hotplug/Linux/vif-nat ---
@@ -86,6 +86,7 @@ router_ip=$(routing_ip "$ip") tools/hotplug/Linux/vif-nat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat
index a76d9c784b..26144350b3 100644
--- a/tools/hotplug/Linux/vif-nat
+++ b/tools/hotplug/Linux/vif-nat
@@ -85,7 +85,7 @@ router_ip=$(routing_ip "$ip")
# Split the given IP/bits pair.
vif_ip=`echo ${ip} | awk -F/ '{print $1}'` vif_ip=`echo ${ip} | awk -F/ '{print $1}'`
hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----') -hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----')
+[ -z "${hostname}" ] && hostname=dom$domid +hostname=dom$domid
if [ "$vifid" != "1" ] if [ "$vifid" != "1" ]
then then
hostname="$hostname-$vifid" hostname="$hostname-$vifid"
--
2.17.1