From nobody Fri May 3 20:44:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1dmarc=pass fromdomain=arm.com) ARC-Seal: i=2; a=rsa-sha256; t=1597921173; cv=pass; d=zohomail.com; s=zohoarc; b=axcvUvMB14zXLqxp1WM+9pUuplv3HSJKwRIsmPRF0HOkdWuhO0IQuWqN4zN1RSzEISFcgl0fqTwBM/t0i9ZykuRYCZlYDhLXzFT4UhzoYefuEmhXM+Jy9VbNV793yHcXN5Zq+FExSb2lNqrRuSZbWsIPUt7GX87ptUhIE61qNBg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597921173; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8AJK7pf4pY504nOT08575pkYv6VE7TKPG2DEhBwtnAA=; b=Dkm5syYf/LoIXE8ofP2nWl8OpzCUo1TZa24nQUgfRETFDmrz32cTXAu9VL8lV7lpydpkZKT/O9/txxmekZMcqNjD/ZTkneq0v2YnO6ZpXM9Y+Gg35xyye53xMCod8DWh9DSjh+uathdDuErhGkIT2+nfwJ70lJhYvzvnQSI1NQM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1dmarc=pass fromdomain=arm.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1597921173507146.65580118489208; Thu, 20 Aug 2020 03:59:33 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k8iHl-0006WV-FA; Thu, 20 Aug 2020 10:59:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k8iHk-0006WQ-3v for xen-devel@lists.xenproject.org; Thu, 20 Aug 2020 10:59:08 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [40.107.21.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6ce8b697-8a98-46f9-8c42-dd1b67a77d90; Thu, 20 Aug 2020 10:59:06 +0000 (UTC) Received: from AM5PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:203:69::18) by AM6PR08MB4037.eurprd08.prod.outlook.com (2603:10a6:20b:a5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.26; Thu, 20 Aug 2020 10:59:03 +0000 Received: from VE1EUR03FT037.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:69:cafe::4b) by AM5PR0202CA0008.outlook.office365.com (2603:10a6:203:69::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.25 via Frontend Transport; Thu, 20 Aug 2020 10:59:03 +0000 Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT037.mail.protection.outlook.com (10.152.19.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 10:59:02 +0000 Received: ("Tessian outbound 34b830c8a0ef:v64"); Thu, 20 Aug 2020 10:59:02 +0000 Received: from 1bfab684ef99.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 59F825ED-436C-469E-B1EA-54C24C4563D0.1; Thu, 20 Aug 2020 10:58:25 +0000 Received: from EUR02-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 1bfab684ef99.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 20 Aug 2020 10:58:25 +0000 Received: from AM6PR08MB3461.eurprd08.prod.outlook.com (2603:10a6:20b:47::28) by AM6PR08MB3111.eurprd08.prod.outlook.com (2603:10a6:209:48::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.20; Thu, 20 Aug 2020 10:58:23 +0000 Received: from AM6PR08MB3461.eurprd08.prod.outlook.com ([fe80::8016:e0c:484c:4255]) by AM6PR08MB3461.eurprd08.prod.outlook.com ([fe80::8016:e0c:484c:4255%4]) with mapi id 15.20.3305.024; Thu, 20 Aug 2020 10:58:23 +0000 Received: from e120809-lin.cambridge.arm.com (217.140.106.54) by LO2P265CA0130.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3283.18 via Frontend Transport; Thu, 20 Aug 2020 10:58:22 +0000 X-Inumbo-ID: 6ce8b697-8a98-46f9-8c42-dd1b67a77d90 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8AJK7pf4pY504nOT08575pkYv6VE7TKPG2DEhBwtnAA=; b=QmIjjB8dWpq1xPb2DK/3qoK3EuzVQIhBv7Yd3DFPsgdrB/SOj5mWt1BqIXRSWB5i6uzabDa6QcECmMUiaupoX+86o2ZrT/4edTdmMVjKmFHw3Q72Knpo8NNmSPLDISnzeyu2a+XxADh12ZquqqiWmZ0mFrUshNbOdjz26H0w5MM= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.xenproject.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.xenproject.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-CheckRecipientChecked: true X-CR-MTA-CID: be0569d494e28231 X-CR-MTA-TID: 64aa7808 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PnG22vCK3y5mY4vtOG/1NzX6jgKeghbY/BGS+bifS6KA9jXrubB5DgI8JbnqqQdPi3yNUUPjSvg21aNCSCSUnptxj+2B61TOn/u4z9CgWGBLfFwuwi3Oki149OP6/fmfVYxec6b1+odv6GQinabj4Nv3M6oGoiYbWUGhyTpZBQvGuaJvD2lE3vc94T06Wu39wjLxyJRjBmhxpDTTpF7t+NZZDlVUhQupq+wqxbgVdcb26fxvZmoWHzXnPWT/yEoEB0rb1Dnlnzv/AFM9qMBF9SSEjf/oSo/zilAfXnPGiO8vCWi9hgNc7fqboEA4NyFZrdsaYQzd359H9F8j578+Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8AJK7pf4pY504nOT08575pkYv6VE7TKPG2DEhBwtnAA=; b=jP8M7XPFXapsLvFZIseREVIe5NB1iaPKMn5W2wsPWxsuNt+WoUIlEf6Z+suaQHZkwxgZithE5RUOncAScQIym+Lbv6D283NAseD7CkeKA0ygHAzorhJp309PsXJSuad5BtDOONlcpz0yJaxdDkaNm/jC7Q6Yv+Y8qfp/sj6h3Dw78viLAlvIjXuFnJaxMoQ6+MAnpkf2SDCCIU0Mxha0Z1Mp7V/U1Rs/wqPYz7/b9Cp/f6dn+0mBpBQa5Zj1y5hgzIZSKEaD6pnfBIorHEyJVDlDRQ8GwjUb2TyQ3sHhK2oQ85y/6ih8W+QJynfvy5tsLmkRDW3j6iFqtKx0+e9XHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8AJK7pf4pY504nOT08575pkYv6VE7TKPG2DEhBwtnAA=; b=QmIjjB8dWpq1xPb2DK/3qoK3EuzVQIhBv7Yd3DFPsgdrB/SOj5mWt1BqIXRSWB5i6uzabDa6QcECmMUiaupoX+86o2ZrT/4edTdmMVjKmFHw3Q72Knpo8NNmSPLDISnzeyu2a+XxADh12ZquqqiWmZ0mFrUshNbOdjz26H0w5MM= Authentication-Results-Original: lists.xenproject.org; dkim=none (message not signed) header.d=none; lists.xenproject.org; dmarc=none action=none header.from=arm.com; From: Diego Sueiro To: xen-devel@lists.xenproject.org Cc: nd@arm.com, Diego Sueiro , Ian Jackson , Wei Liu Subject: [PATCH 1/3] tools/hotplug: Fix hostname setting in vif-nat Date: Thu, 20 Aug 2020 11:58:20 +0100 Message-Id: <689b543715a858ad0fb0c1d849dd8ec70b3d20be.1597920095.git.diego.sueiro@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-ClientProxiedBy: LO2P265CA0130.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::22) To AM6PR08MB3461.eurprd08.prod.outlook.com (2603:10a6:20b:47::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [217.140.106.54] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a45d2cff-db3e-4ebc-dfce-08d844f80cca X-MS-TrafficTypeDiagnostic: AM6PR08MB3111:|AM6PR08MB4037: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:2276;OLM:2276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 7Wow+Aiid845N+KhYCF8DjGahxTHpKeKCVUGws7Esi4Fvm00NUmHZXiO9gIF2RWaJMYffMYn54WZgLzFO4KOLhPUPtwAjYiFSklfewmXjZ+3BfytyMtotbucxgSEosT/pTNMMPZV/BpBqvS/BCDtcK1GLDJw4I/cJ+QoLOHcVwy8ypOw85rrdaWqepDrmfjcZLT0aNqfS2NWhK4uyxtR+B2w3SqE+EhHQRR/naxmgXX7f9Gp8/puuxT68vJK6aBF4u6CNpx7P8h8TlbDxaQZDWrZRM8hnkwaDbl1WQkwigcXU8bCd6pbthQE+zqGB/XnQ2U3n8TNMUXMkZOHuTgwAMNEgD3t6eWVVHXRNYRAs2d99+Xln4jOBQZbKGV8okPa X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3461.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(366004)(39860400002)(396003)(86362001)(54906003)(66556008)(7696005)(66476007)(83380400001)(5660300002)(4744005)(26005)(66946007)(44832011)(8936002)(316002)(36756003)(6916009)(52116002)(2616005)(16526019)(186003)(6486002)(66574015)(956004)(2906002)(8676002)(478600001)(4326008)(136400200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PIcaxSTnqLGkk6vm9NlBpi6BpvRtsTy/IqXP0W+aOXOviS9anJfDNLjMnUIEd0gyv9UPmaQ5POhsvPWNyGZR5kD91+bMmdP727FAoL24Ffb4djz2sI/NVFCDWG7PyCVi2yPkb85m3XFh4j+bz1GbJC0XMHWKf2qSTOl21oEfwMqnkGwBh5cut8pDXhn+38bCI/uKNlK4W7rC26J+uugjSx+oppRzN56k5iiakpgFrOYXXoAPx5mAU2rr+WHH9n3ejX3yA7SROcphSqlUNL52RjhjfZgs1tuyBQghB3alrI0KxAycEIEr8kVliMkiCSWOhGd5vRJn8zNA5SD1HOr6TQW4Sx0sTAJPnh69j0mqaAWyn3UwrvwZjHPRi6cYazFM8M4Y//lfs5raVl7pnnfvjOmMXZXTtQH/Y0pLX32wNxdHsBJvJcZ1+k7GkRqgNSaijb/LgO2w9kvmP/lUXNSKbF2ohSXUJyU5XvMAMm+zED953ptaJUnTHq425FDRH1PfBkBkPtUDK/JlUePnBXgavkAf0RcTyX5kBG9L/bxqlYtdBliluAWCRB5UCmm5/rf7ZxFt1jQVCQVYETttCgSp5656xkV1M5f9DoayWuB2mw276KGM3CVBahHlsI99v6wNZHg/PWNJmnEAm4ufCJ8gxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3111 Original-Authentication-Results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT037.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 90b72c69-e103-4e40-e8c3-08d844f7f4f5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vvp7jWEAMTl46GhByX+RX8y5mnTSln9P66tiiLjhbm3ibbIdY+Qxw5oxQaKiuPdLkS0dou5IhEHNQLGF3JjK3h6jejnajA3il+LMJJOsouHDgAj3cxMV2hAUeTlQ1vW9H0cL0lAV6bjtmXkbyRZSlA1zz5+LapwlIyRgBC88DHRGQwtsrTMpFPNwnx8/ORI+/pXS0x5TnGp6N3paWVZe4LpMRF0E7aYechL7VLfzCqJRaVS2B8Hno8RLGh1fMmxKtapR2vLvjjQY5hjplr/ppeDJsqoEKdIglcW1Pn16KcslEs2RrlcmKrv/DaBc4U5mthqrFCFImEq9SgrWYAlV5XPQ1pHS/it7HhzlPQ8za0bV8raRdz/YzepiMau7tujmvAuVxjDYZBOVuCpX62FG82DrjVZ0sbDFct9IQyQo56Qhnbtx3OZ72VvYuMbLF/Rl X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(376002)(346002)(39860400002)(396003)(136003)(46966005)(6916009)(956004)(2616005)(82310400002)(26005)(4326008)(8676002)(5660300002)(316002)(70586007)(81166007)(36906005)(70206006)(44832011)(356005)(86362001)(478600001)(83380400001)(82740400003)(2906002)(54906003)(8936002)(6486002)(66574015)(4744005)(7696005)(47076004)(336012)(186003)(36756003)(16526019)(136400200001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2020 10:59:02.8356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a45d2cff-db3e-4ebc-dfce-08d844f80cca X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT037.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4037 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: pass (identity @armh.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Setting the hostname is failing because the "$XENBUS_PATH/domain" doesn't exist anymore. To fix this we set it to dom$domid Signed-off-by: Diego Sueiro Acked-by: Wei Liu Reviewed-by: Bertrand Marquis --- 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 a76d9c7..2614435 100644 --- a/tools/hotplug/Linux/vif-nat +++ b/tools/hotplug/Linux/vif-nat @@ -85,7 +85,7 @@ router_ip=3D$(routing_ip "$ip") # Split the given IP/bits pair. vif_ip=3D`echo ${ip} | awk -F/ '{print $1}'` =20 -hostname=3D$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----') +hostname=3Ddom$domid if [ "$vifid" !=3D "1" ] then hostname=3D"$hostname-$vifid" --=20 2.7.4 From nobody Fri May 3 20:44:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1dmarc=pass fromdomain=arm.com) ARC-Seal: i=2; a=rsa-sha256; t=1597921257; cv=pass; d=zohomail.com; s=zohoarc; b=bcb5pQzts0ktFh+f77SnSVpXz5/aXmoqo7N4GH0seNZDfEQKze+fhiMWMZyhOpTp6RAb/t3D3G/KZVdbmC+PaFtoLqwOCU6M8d7H2+fhada2YpMbAbeaC/NgfJOpfE9hy2JIWwc3+Wof5berTKIO+Qlm5Jb8TwIrVfINAxoFh8I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597921257; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FNKPwqJpwUyVgt1gJW++t2rufxR2av2yxpDsmw1ZMKI=; b=m6eNmnVAXCusYDF6Ndv+WUPBgCmJP7ZkwL9zc2IKP99ZF1aaamLt7OTsPjKJMFsct3KhuLc6O88bhsXucHwszE2UiuEqZjLwpEmCm6kQmtun6Vljjxqx7lKtInHcBH01biVMa+NV8hvZi7iFzL68sNSCQMfslF6jl5qVHq9lGck= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1dmarc=pass fromdomain=arm.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1597921257456901.4619235784728; Thu, 20 Aug 2020 04:00:57 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k8iJE-0007MP-36; Thu, 20 Aug 2020 11:00:40 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k8iJC-0007MF-Oh for xen-devel@lists.xenproject.org; Thu, 20 Aug 2020 11:00:38 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [2a01:111:f400:7d00::612]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2a0ba58a-9411-49d5-84d5-6d52ace01ebe; Thu, 20 Aug 2020 11:00:37 +0000 (UTC) Received: from DB8P191CA0011.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:130::21) by AM0PR08MB4131.eurprd08.prod.outlook.com (2603:10a6:208:129::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Thu, 20 Aug 2020 11:00:35 +0000 Received: from DB5EUR03FT018.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:130:cafe::9) by DB8P191CA0011.outlook.office365.com (2603:10a6:10:130::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 11:00:35 +0000 Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT018.mail.protection.outlook.com (10.152.20.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 11:00:35 +0000 Received: ("Tessian outbound a0bffebca527:v64"); Thu, 20 Aug 2020 11:00:35 +0000 Received: from 8be41c3b1887.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F433E4F7-5B65-4AEF-8D55-279508319E77.1; Thu, 20 Aug 2020 11:00:29 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8be41c3b1887.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 20 Aug 2020 11:00:29 +0000 Received: from AM6PR08MB3461.eurprd08.prod.outlook.com (2603:10a6:20b:47::28) by AM5PR0801MB1937.eurprd08.prod.outlook.com (2603:10a6:203:4b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Thu, 20 Aug 2020 11:00:26 +0000 Received: from AM6PR08MB3461.eurprd08.prod.outlook.com ([fe80::8016:e0c:484c:4255]) by AM6PR08MB3461.eurprd08.prod.outlook.com ([fe80::8016:e0c:484c:4255%4]) with mapi id 15.20.3305.024; Thu, 20 Aug 2020 11:00:26 +0000 Received: from e120809-lin.cambridge.arm.com (217.140.106.54) by LNXP123CA0015.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 11:00:26 +0000 X-Inumbo-ID: 2a0ba58a-9411-49d5-84d5-6d52ace01ebe DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FNKPwqJpwUyVgt1gJW++t2rufxR2av2yxpDsmw1ZMKI=; b=cRRcrNpZv9Dk+nt9aTJ8lir6CkaKd/0A/mRZu+zFCBnf0sNaSVkt0NIucgNe24rZQIk+lblwrcDN7fBBpCEdo8FG6oVClTAMY+CbOWYMm2IiiCvKxHgU8EtU7VN3dG2p95AJI8Ha8MrmrtS0lsuK/+vRy8Wwrw/iny4SQ+u4R1A= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.xenproject.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.xenproject.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-CheckRecipientChecked: true X-CR-MTA-CID: ee6fdea2d99db592 X-CR-MTA-TID: 64aa7808 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XxfjOqiCKLw0kTZ3Ze0k7X2Kw58LBwMWnmP9ihnA/ravabd2Qbb1P934UBGOa3/GOKnwRngcR5nignltn596WOVLbv+qg1Kso8k/HAVOGOzUh9uDwTkKDoHhOtkzZOHUhT0RSP57uQJxDldZ0NDGwjBhkQHWGDILXOVE2aPiveT3ZpJR34yzT4R6Hzn0mcTDXli6g73aZHf/h8yYBAaek/nFKoIXQ+JNvzptvdC2JkG3jdqd8QD/eCMx21swHWcfL9Wke1X2tuAf2dZPeiphE9s+rz2OXOHDo7nH/DkkdVjpV+d+CsqQ5TCPu7aJ2DjxlJH2vUh3qp9lplEW5TOFdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FNKPwqJpwUyVgt1gJW++t2rufxR2av2yxpDsmw1ZMKI=; b=jG9YfdkfheWthJ9iM9lPmkT0FcnxmNV2g2S68ygpx4FwH1/gOOJDp/rgDQJroPBQTtnfX50is/J4DI5EEDygAUeyIEDY6RAu/A+UdYRdNH1dGNZRdQQ7dtUw1z3kY2LZ7KU7NuTMtx3o0YpROlmhGbvT6RZua/Q+Rh/JMON4a/AMg3zCeUqoK+N/maPdI0mQjBkim3vZ7VeC7XvrZj4P0hdxx1kNHvtR9qTkKo0+RBzpPMGB2ZHEo7cFmk7KdE6WqfsvirHywekYpzFAXHAHxCcqFm8485rO1ymL/T35FZigjpraWsuUqFRFm/T8NT2JRJzpG7BxoW0ViuwnAB+5zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FNKPwqJpwUyVgt1gJW++t2rufxR2av2yxpDsmw1ZMKI=; b=cRRcrNpZv9Dk+nt9aTJ8lir6CkaKd/0A/mRZu+zFCBnf0sNaSVkt0NIucgNe24rZQIk+lblwrcDN7fBBpCEdo8FG6oVClTAMY+CbOWYMm2IiiCvKxHgU8EtU7VN3dG2p95AJI8Ha8MrmrtS0lsuK/+vRy8Wwrw/iny4SQ+u4R1A= Authentication-Results-Original: lists.xenproject.org; dkim=none (message not signed) header.d=none; lists.xenproject.org; dmarc=none action=none header.from=arm.com; From: Diego Sueiro To: xen-devel@lists.xenproject.org Cc: nd@arm.com, Diego Sueiro , Ian Jackson , Wei Liu Subject: [PATCH 2/3] tools/hotplug: Fix dhcpd symlink removal in vif-nat Date: Thu, 20 Aug 2020 12:00:23 +0100 Message-Id: <3b0efb9fb1ba94922c0ae156c0ab0be6a9f45f25.1597920095.git.diego.sueiro@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-ClientProxiedBy: LNXP123CA0015.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::27) To AM6PR08MB3461.eurprd08.prod.outlook.com (2603:10a6:20b:47::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [217.140.106.54] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4d7f42ec-be64-4e6d-b5ba-08d844f843aa X-MS-TrafficTypeDiagnostic: AM5PR0801MB1937:|AM0PR08MB4131: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:418;OLM:418; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 2gRHFmTKoG5/Gcb05CmLKtWoV7+MxaK3CIOgokkURlB7I+aTFTpJB4OY1N7Up3qSYJGh3WufAeqwfqYlAfFtxreWq+fKGvT75uWLOmpdSwbaj9VmygI3Xivx+rO9aUNASKVV5ExJtV3NAnTWWBaHI9vG4W0cE8zhO3Ti/SSHETS3OYGlDcZbJV1lSU3Akoi1KsnCY/RU3YB/EiGMG6KBtPXVNRz3iNMNzuycnFua1AaB+BOKkEJvWos6waBo7834tg9jDlM5mjXNFJj/T94lAaaW+qwSKmTH2AmfDSXv9xpwy3RyQW5NN+/+4X6fLe450CPkD+hbtGoxkkwB45vrjPsYoGqKz5v6T3h3qa27yXWIsd6R7bJkQydqWnDj7Shs X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3461.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(39860400002)(396003)(366004)(6486002)(6666004)(2906002)(478600001)(66946007)(83380400001)(54906003)(16526019)(8676002)(5660300002)(44832011)(956004)(2616005)(316002)(6916009)(66476007)(186003)(66556008)(26005)(36756003)(7696005)(86362001)(4326008)(52116002)(8936002)(136400200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: L+HynnngJ558APZyCqP1Eczaif70nS+U398hNicOOM1DyO/xaWEgm8bm0hvfgdc/nckHR1rHqLEcRT4IGzAGwR9RAns4wXcflw55xNDG6ahwvSngXmUr44VVC5O6sas3otysik0h4hLuRU3afrc1KIwxITXqLId81Af8aT6bgjYzQkVvg98a0Fd9HSWAi48lZu3k6vTlKA2XvI+dionsu6AYXfMeoVME4bNPGGoI9Tdg1m/ISsVV0/vvcDLU808mCakg+SQHPQtJgFL4lBh5bYYoW6p3u4u+1naHqZwFv+Z4wz/Md5UM6QtxSWpephmNfGuCxfQA0aThSmrInmPhT7J8o0gbfYRYDwYvz8Xa/mS7NBGUZQampTvc3vVUb+dGaOSdBveHDm3u3RdAJwGBUETUTFx+lp3ulOBNMTpptxE638Ud2GwX16zSzwv0592eFGmzwVcQyhd8NaRy0Ypje3dxKYpXTrQstcznHDxK7LHopjkFIwjVzrpEnjz6v4zI4KI6zCsTC/9g+Ey5hQqdjq8CgVk0ae+dlqd+2dQT5GFy81TfcQcpOD7PDCblT1JGkvX06TelzUpcaOQBp2GtwD7sa+YLBnF6tu9FEmGe1KzyP5S6P1yMi+0QRHVxhmkIiRzHEKCypoNzGK74zReIuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1937 Original-Authentication-Results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT018.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 3ec01056-9856-43bb-e8e6-08d844f83e7e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Po7NrxkkTv54NI3WjMvluYNjj9k6vI+VB/iTuPkT6gOfK9psWPUMak0odndeoeUV4H204qBs8PyQCjvZoSv6u2CmZSRy2o5MTRtmO61a+cwYVIG6kZ9G7GM99PV2LnbFhZT115kRCGPmFnZkYLbBqJR324WbTrfizTiytWGRDzqAFUUc0jVqI0TnYdWaTWi07ljaxApkOUGlHBGM4FA4KMDlJ5RJinmgF5U93qf5f3o63zohJV57xjlrwKjnzIm86B4dYmevty3031EqtOPRkszfg0yrJXGFNARyiEGoNM4lkXYc7bcuVNZ6KBUiQRGgYCIMxNlzKZqMGmpipcrAn3XezaJlA3wMbBxLOnGxF4UZh40+HISMxs/x+5OaqSyJllLQY8nfLY59TqYxUfl9c/2kT0P4zt0+MZrzyFqgLH7rWGsyy94xZZvVNwy689hM X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(376002)(346002)(136003)(396003)(39860400002)(46966005)(70586007)(6666004)(83380400001)(36756003)(5660300002)(2906002)(6916009)(82310400002)(8936002)(8676002)(86362001)(70206006)(356005)(7696005)(16526019)(82740400003)(478600001)(54906003)(81166007)(316002)(6486002)(2616005)(47076004)(336012)(26005)(186003)(44832011)(956004)(4326008)(136400200001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2020 11:00:35.0694 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d7f42ec-be64-4e6d-b5ba-08d844f843aa X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT018.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4131 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: pass (identity @armh.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Copy temp files used to add/remove dhcpd configurations to avoid replacing potential symlinks. Signed-off-by: Diego Sueiro Reviewed-by: Bertrand Marquis --- tools/hotplug/Linux/vif-nat | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat index 2614435..1ab80ed 100644 --- a/tools/hotplug/Linux/vif-nat +++ b/tools/hotplug/Linux/vif-nat @@ -99,7 +99,8 @@ dhcparg_remove_entry() then rm "$tmpfile" else - mv "$tmpfile" "$dhcpd_arg_file" + cp "$tmpfile" "$dhcpd_arg_file" + rm "$tmpfile" fi } =20 @@ -109,11 +110,11 @@ dhcparg_add_entry() local tmpfile=3D$(mktemp) # handle Red Hat, SUSE, and Debian styles, with or without quotes sed -e 's/^DHCPDARGS=3D"*\([^"]*\)"*/DHCPDARGS=3D"\1'"${dev} "'"/' \ - "$dhcpd_arg_file" >"$tmpfile" && mv "$tmpfile" "$dhcpd_arg_file" + "$dhcpd_arg_file" >"$tmpfile" && cp "$tmpfile" "$dhcpd_arg_file" sed -e 's/^DHCPD_INTERFACE=3D"*\([^"]*\)"*/DHCPD_INTERFACE=3D"\1'"${dev}= "'"/' \ - "$dhcpd_arg_file" >"$tmpfile" && mv "$tmpfile" "$dhcpd_arg_file" + "$dhcpd_arg_file" >"$tmpfile" && cp "$tmpfile" "$dhcpd_arg_file" sed -e 's/^INTERFACES=3D"*\([^"]*\)"*/INTERFACES=3D"\1'"${dev} "'"/' \ - "$dhcpd_arg_file" >"$tmpfile" && mv "$tmpfile" "$dhcpd_arg_file" + "$dhcpd_arg_file" >"$tmpfile" && cp "$tmpfile" "$dhcpd_arg_file" rm -f "$tmpfile" } =20 @@ -125,7 +126,8 @@ dhcp_remove_entry() then rm "$tmpfile" else - mv "$tmpfile" "$dhcpd_conf_file" + cp "$tmpfile" "$dhcpd_conf_file" + rm "$tmpfile" fi dhcparg_remove_entry } --=20 2.7.4 From nobody Fri May 3 20:44:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1dmarc=pass fromdomain=arm.com) ARC-Seal: i=2; a=rsa-sha256; t=1597921320; cv=pass; d=zohomail.com; s=zohoarc; b=QVCUEKMX3vHxgavR8qZ8n2P8c8qXHkK/nEegIdUsyZ2vzdC5j1cuu10j3Jp1WzaNag+DbW7rxZP6PYImYzn4o1uKC3ymNz6/Vlm1yWEA+mCXF3CtQlTUgEyZ256hsg47UXNz889GRpAhHiwfD0VO5MihwF2SN+2BHq4IHiLZaYY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597921320; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XjycY1NYkgo1wh82XjE9VDeZgdK5y5E7vxVDBjDZIzQ=; b=ODFtYS3c/nXvhOiycFG8j860QyfuXJypkPwLlU9LMhNdCm2i9mnN/7pW2zV8k3rdj5DcBFZTu+O5fgUK4Hrn0JYO0cxPqxdVY6s6brZMgBijWD0lrH3Tz02klkZRoVty3eRZujNN8pozEazMEUQYYglIqfli6EutDZDrwq95LN8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1dmarc=pass fromdomain=arm.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1597921320047641.9965305397866; Thu, 20 Aug 2020 04:02:00 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k8iKB-0007Re-Dc; Thu, 20 Aug 2020 11:01:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k8iK9-0007RQ-Sg for xen-devel@lists.xenproject.org; Thu, 20 Aug 2020 11:01:37 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (unknown [2a01:111:f400:fe0c::611]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 915d5284-91a4-4f62-b267-8eb7ee2737b6; Thu, 20 Aug 2020 11:01:36 +0000 (UTC) Received: from MR2P264CA0059.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:31::23) by AM0PR08MB4497.eurprd08.prod.outlook.com (2603:10a6:208:146::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24; Thu, 20 Aug 2020 11:01:34 +0000 Received: from VE1EUR03FT036.eop-EUR03.prod.protection.outlook.com (2603:10a6:500:31:cafe::47) by MR2P264CA0059.outlook.office365.com (2603:10a6:500:31::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 11:01:34 +0000 Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT036.mail.protection.outlook.com (10.152.19.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 11:01:34 +0000 Received: ("Tessian outbound 7a6fb63c1e64:v64"); Thu, 20 Aug 2020 11:01:34 +0000 Received: from 8be6e5a9f9d1.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 722BA6CF-3497-455C-971D-B3E476A41201.1; Thu, 20 Aug 2020 11:01:22 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8be6e5a9f9d1.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 20 Aug 2020 11:01:22 +0000 Received: from AM6PR08MB3461.eurprd08.prod.outlook.com (2603:10a6:20b:47::28) by AM6PR08MB3111.eurprd08.prod.outlook.com (2603:10a6:209:48::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.20; Thu, 20 Aug 2020 11:01:19 +0000 Received: from AM6PR08MB3461.eurprd08.prod.outlook.com ([fe80::8016:e0c:484c:4255]) by AM6PR08MB3461.eurprd08.prod.outlook.com ([fe80::8016:e0c:484c:4255%4]) with mapi id 15.20.3305.024; Thu, 20 Aug 2020 11:01:19 +0000 Received: from e120809-lin.cambridge.arm.com (217.140.106.54) by LNXP123CA0021.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3305.24 via Frontend Transport; Thu, 20 Aug 2020 11:01:19 +0000 X-Inumbo-ID: 915d5284-91a4-4f62-b267-8eb7ee2737b6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XjycY1NYkgo1wh82XjE9VDeZgdK5y5E7vxVDBjDZIzQ=; b=fmOo/5If9OMBi04cbybCysB8/paYSjmVuUbCjiXBz/9NLryrszWppNa9sb7SqQ/gIQ0Phgce/xiser0mXv8I5Wct+j0foZRmP0prCY44IYUH4OOui+TvawhSP8ow455vg5owHjpW1nL/9Q8e7k4lkIYVSq5EkBR6eczyilg79ic= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.xenproject.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.xenproject.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-CheckRecipientChecked: true X-CR-MTA-CID: 2860f0c3cf0fcdcd X-CR-MTA-TID: 64aa7808 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iOP/ysMGA3sPkx086uKd6Rs55XW2s/46lFzx4RAm0ewhghOJEn2PWVjHp5XE1eGCg7S8bzQVrEs9N7+nVInIEK2kYJCBjJATyRrM4t0WIdEVE2+CkezBnbqgXWiodXGCGW665skkRTcgYdSrr2v2Dh325qE5ltOR3mUuTmnT9w+YtO9hlCOJQOHc4c8r1KLMz0ljGJZx9OJZKc69d1rw/JpUnSSwcte5O5U2W7AXuD2+lboyDn2deJOL3AjpbNVpp79Mf7VeLXIhcucLEPlpSfGpKqG/WuNqvXXXMlENMjvTJpeBC5e0OjuOE9W5F6PXcyrAsSVqf34wMQjaz5URng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XjycY1NYkgo1wh82XjE9VDeZgdK5y5E7vxVDBjDZIzQ=; b=V/MUU8yn3uLpU82JZhKuWhasAbJ4uiEuGykl17omBH/C8umT+kmclwbcYiGMoLACJTuCJ6PQ9SFXxVL3Nj/rEMKgPkejqKaEOqHKkAW+6rqgF7C4eYGBh3iYvvmd+6VU90dndN/IZuYQuVBgaySJ9YvZmO0rktt+HR3ozIzvGOT9ABwiVd3JNeyflzirm3T8brA+xEPmFz0cen5GlCX/FAtGqpbpybJm8JbIxIAm+S6+aCyfDIPoEbPN3FBqRKBiGR1+vZtbBKFFU/uhdXWEd/b+2DK/zbqxPr50m1VRr9vhDNNXhoG6KwNmqHEeWMrIW5jUcMsmqyz7iEJC8JN/NA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XjycY1NYkgo1wh82XjE9VDeZgdK5y5E7vxVDBjDZIzQ=; b=fmOo/5If9OMBi04cbybCysB8/paYSjmVuUbCjiXBz/9NLryrszWppNa9sb7SqQ/gIQ0Phgce/xiser0mXv8I5Wct+j0foZRmP0prCY44IYUH4OOui+TvawhSP8ow455vg5owHjpW1nL/9Q8e7k4lkIYVSq5EkBR6eczyilg79ic= Authentication-Results-Original: lists.xenproject.org; dkim=none (message not signed) header.d=none; lists.xenproject.org; dmarc=none action=none header.from=arm.com; From: Diego Sueiro To: xen-devel@lists.xenproject.org Cc: nd@arm.com, Diego Sueiro , Ian Jackson , Wei Liu Subject: [PATCH 3/3] tools/hotplug: Extend dhcpd conf, init and arg files search Date: Thu, 20 Aug 2020 12:01:11 +0100 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-ClientProxiedBy: LNXP123CA0021.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::33) To AM6PR08MB3461.eurprd08.prod.outlook.com (2603:10a6:20b:47::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [217.140.106.54] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9aa263c3-2f34-4dea-b2c7-08d844f866f1 X-MS-TrafficTypeDiagnostic: AM6PR08MB3111:|AM0PR08MB4497: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3276;OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: UMvJYLzNEUn5rTqHRUyLFWuRjtNmOaqFQZwh3SUeKE5n9mVND4ipQ5buB6RAYAYQNe8NuViHv9eXPEApr8zIihQH6zUUm0wS/2SyLqSvwrplMC4EPelzwzgcFFUWAD5FELfyQ7nK2vfupbcKjATRglyovr4agOQH62QjUsSSZas0yFB4iAOQ1s36474WdwVk08zEj4e+SNLSXwYsIyxqOgUsPBCstdtlG3wVLf9T/VN8QgWycNU6kUc8Dlv5In0/lT5va8R1QEayAGMqhbqDt5v9ZJ8a10g9f1q441OO0LZJL4NM76efmTaLIkwoM8Q1auiyujLqasese72hxBXRsQiQc4XqPzMQzSzSp6p0nDttw75udLGmpR1Pgdx5Gvb9 X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3461.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(39860400002)(366004)(376002)(136003)(346002)(6486002)(2616005)(16526019)(186003)(4326008)(2906002)(6666004)(956004)(478600001)(8676002)(83380400001)(7696005)(66476007)(66946007)(26005)(5660300002)(54906003)(66556008)(86362001)(36756003)(6916009)(52116002)(8936002)(316002)(44832011)(136400200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Rc9EB1WDBBBzkDUddZVPAhBH/oBaEB+eaq5BCa89xv7UTRtC/UR7QlWf51nuK64N/ZABCco5hrnDceMv3Yehjqp48zMmM6O2hsgZ0fAi4CrKcm+wZ7ZNWUk/CQg4wYO0oIY4ipsgmY2iXJpgX4M7lU1NJEg6bdKgw07mgzhypKqk6HY6qBGLm5HNdzvMiwWMxaDFt+WUqC2ZP7q2g/i/dfVWn08Ebkis+U4P3aydqqV0r5Y0pP8g6J/LeGkCPBMqy+45qKtp4H0DgaZAGDdJobownbF3o2NkMBvb2xBUp2jH3oAEmQOuRIY3jRkmKVWu5fkWbjK0E3M1E1kQCDuqNhMvQ48RmGAF3r/Pwb0wYwB6xbuuOTO0DXpyixap8ieacOD+rnbrPdLM2WTx7DbDI0avIUjsQnBqUAKApvGumfdCGUJY546jH36wr7Jdafhwt2ZYJ0kN4jqbLcecvWYkiYp4sxrDkgH9HJJqueBSa7n3516iMzZfES6U00Waid/GiBdinf5hzldgGPEEgHrrNRidLuW6psw8axOu0bVQG44I/BARSNrw8LYACf1h52ZRbfzPWpOOPkpElfCN6j0zMqfTBBCnwyWX7Oj/W/xbUaNbMV7aR/RxWmjJ1UhyNurrAOPNZm06GR/Q0+cb84PVWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3111 Original-Authentication-Results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT036.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: f2171fc1-605f-421a-3fc1-08d844f85e1e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0eJMnwMoYWN8guiWlC61pduEOnMwYg6fLVqVtD/1bQ6nhAh+baiyQ2pvvWmLhFUryDN7b+2KMxcdC1g6gxBUQ57QiUxz5eKq60eVOi3Puu+TTZGYDGHh231vhdYsW4Dta5N52OpEwlp09G2FcszL9eX4D3bEkHlxUF8R3kEXB7ldNgGt08RzBrpWoA9mLtYirB9xLIyyZK9Q4aijzKWqcGN3S7GnoOLml619PHsCSaYC2dOBmJAdEh2uFYWuMbCMBxp1HSCpkVWbvE3nJB+5wnhR9se5poyMKgxrHM1+Su4rSsCZBgvF+jtUXKwrJxruiEFe352erqEq0YuFbZrR1zdeuN9YpDhGmqzOwDUVyv0BlkBBwga6RNae/vLod6X0IyHLQxzhy5567sy96mFIevIO5W/Ezs/Xfgi5wb30nkCcyBuD0nE+GPfrzJnsoFQJ X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(346002)(136003)(376002)(39860400002)(396003)(46966005)(36756003)(81166007)(8676002)(6666004)(8936002)(2616005)(83380400001)(54906003)(6486002)(6916009)(2906002)(356005)(956004)(478600001)(82740400003)(26005)(47076004)(44832011)(7696005)(336012)(4326008)(16526019)(36906005)(70586007)(316002)(70206006)(5660300002)(82310400002)(186003)(86362001)(136400200001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2020 11:01:34.1501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9aa263c3-2f34-4dea-b2c7-08d844f866f1 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT036.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4497 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: pass (identity @armh.onmicrosoft.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Newer versions of the ISC dhcp server expect the dhcpd.conf file to be located at /etc/dhcp directory. Also, some distributions and Yocto based ones have these installation paths by default: /etc/init.d/{isc-dhcp-server,dhcp-server} and /etc/default/dhcp-server. Signed-off-by: Diego Sueiro Acked-by: Wei Liu Reviewed-by: Bertrand Marquis --- tools/hotplug/Linux/xen-network-common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linu= x/xen-network-common.sh index 8dd3a62..be632ce 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -64,18 +64,18 @@ first_file() =20 find_dhcpd_conf_file() { - first_file -f /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf + first_file -f /etc/dhcp/dhcpd.conf /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf } =20 =20 find_dhcpd_init_file() { - first_file -x /etc/init.d/{dhcp3-server,dhcp,dhcpd} + first_file -x /etc/init.d/{isc-dhcp-server,dhcp-server,dhcp3-server,dhcp= ,dhcpd} } =20 find_dhcpd_arg_file() { - first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp3= -server + first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp-= server /etc/default/dhcp3-server } =20 # configure interfaces which act as pure bridge ports: --=20 2.7.4