From 780fba34818d04d25c3825cedc9921ef1b645cdc Mon Sep 17 00:00:00 2001 From: Kamil Dziezyk Date: Tue, 8 Dec 2020 11:17:13 +0100 Subject: [PATCH] arm-autonomy/xen-tools: update vif hostname fix patch status 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 Change-Id: I35f04bfa0f0fff81a1ef20d500b9323e5f13b9ed Signed-off-by: Jon Mason --- .../xen-tools/0001-vif-nat-fix-hostname.patch | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch b/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch index 87f25e25..d2e52cef 100644 --- a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch +++ b/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch @@ -1,18 +1,34 @@ -Upstream-Status: Pending +Upstream-Status: Backport Signed-off-by: Diego Sueiro +Signed-off-by: Kamil Dziezyk + +From 5499e0fc8082024bf7e2d0facd5c976e82105070 Mon Sep 17 00:00:00 2001 +From: Diego Sueiro +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" doesn't exist anymore. To fix this we set it to dom$domid -Index: git/tools/hotplug/Linux/vif-nat -=================================================================== ---- git.orig/tools/hotplug/Linux/vif-nat -+++ git/tools/hotplug/Linux/vif-nat -@@ -86,6 +86,7 @@ router_ip=$(routing_ip "$ip") +Signed-off-by: Diego Sueiro +Reviewed-by: Bertrand Marquis +Acked-by: Wei Liu +--- + 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}'` - hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----') -+[ -z "${hostname}" ] && hostname=dom$domid +-hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----') ++hostname=dom$domid if [ "$vifid" != "1" ] then hostname="$hostname-$vifid" +-- +2.17.1