From patchwork Fri Jan 20 12:19:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9528157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 674C960459 for ; Fri, 20 Jan 2017 12:23:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5906228560 for ; Fri, 20 Jan 2017 12:23:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DEAD28616; Fri, 20 Jan 2017 12:23:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D401D28560 for ; Fri, 20 Jan 2017 12:23:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUYC5-0001Dh-2w; Fri, 20 Jan 2017 12:21:25 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUYC3-0001BL-Pb for xen-devel@lists.xenproject.org; Fri, 20 Jan 2017 12:21:23 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id A8/7F-29440-3C002885; Fri, 20 Jan 2017 12:21:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeJIrShJLcpLzFFi42JxWrohUvcQQ1O EwcR5uhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aetm3sBRcEKk7s2M3WwDiJt4uRk0NCwF9i 6aSJzCA2m4CuRNOWv2xdjBwcIgIqErf3GoCYzAKhEjteWIJUCANV/zlwFqyCRUBVoveREkiYV 8BLYvbmBiaIgXIS54//BBvICRTf0LkNzBYS8JRo/POTEaRVSEBNYu76eIhWQYmTM5+wgNjMAh ISB1+8YJ7AyDsLSWoWktQCRqZVjOrFqUVlqUW6FnpJRZnpGSW5iZk5uoYGZnq5qcXFiempOYl JxXrJ+bmbGIEhwwAEOxhnX/Y/xCjJwaQkyrv7Y0OEEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQne iv+NEUKCRanpqRVpmTnA4IVJS3DwKInw9oOkeYsLEnOLM9MhUqcYFaXEeWNBEgIgiYzSPLg2W MRcYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjBvG8gUnsy8Erjpr4AWMwEttlKuB1lckoiQkm pg5BfJe7FZ++vnC3ZhJvyPomPPaJ/NW1nsO2njwqO5DRMdVDTCnv2RnlMhctP73ao+zTWXMzz 85/16tqg7YG2y0QzNnHdvHq2/tmL2k/m33v7ayljMKGG47NHO5FM+Ozd9aJGty5x8uyaG/c0M +6lTLr9p+yXtI8i1ynf2ilmrutjXVsyw4Np6m1+JpTgj0VCLuag4EQCdW1EEkwIAAA== X-Env-Sender: prvs=18694997c=Ian.Jackson@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1484914881!53721367!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41000 invoked from network); 20 Jan 2017 12:21:22 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 20 Jan 2017 12:21:22 -0000 X-IronPort-AV: E=Sophos;i="5.33,258,1477958400"; d="scan'208";a="400967948" From: Ian Jackson To: Date: Fri, 20 Jan 2017 12:19:08 +0000 Message-ID: <1484914764-20861-20-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484914764-20861-1-git-send-email-ian.jackson@eu.citrix.com> References: <1484914764-20861-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 19/35] netboot: Change pxe to netboot in variable names X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 6 +++--- mg-hosts | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index fde796a..bb72fe5 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2453,10 +2453,10 @@ sub setup_grub_efi_bootcfg ($$) { my $f = "grub.cfg-$ho->{Ether}"; my $grub= $ho->{Tftp}{Path}.'/'.$ho->{Tftp}{GrubBase}.'/'. $c{TftpGrubVersion}."/pxegrub-$r{arch}.efi"; - my $pxe=$ho->{Tftp}{Path}.'/'.hostnamepath($ho).'/pxe.img'; + my $img=$ho->{Tftp}{Path}.'/'.hostnamepath($ho).'/pxe.img'; - logm("Copy $grub => $pxe"); - copy($grub, $pxe) or die "Copy $grub to $pxe failed: $!"; + logm("Copy $grub => $img"); + copy($grub, $img) or die "Copy $grub to $img failed: $!"; logm("grub_efi bootcfg into $f"); file_link_contents("$ho->{Tftp}{Path}$ho->{Tftp}{TmpDir}$f", diff --git a/mg-hosts b/mg-hosts index 60b0742..20f40b0 100755 --- a/mg-hosts +++ b/mg-hosts @@ -118,10 +118,10 @@ sub cmd_mkpxedir () { my $sudo = $ENV{'OSSTEST_SUDO'} // 'sudo'; foreach my $hn (@ARGV) { my $ho= selecthost("host=$hn"); - my ($dir, $pxefile) = host_netboot_file($ho); - my ($rdir, $pxerealfile) = host_netboot_file($ho, 'TemplatesReal'); - $pxerealfile //= $pxefile; - my $dirname = dirname $pxefile; + my ($dir, $file) = host_netboot_file($ho); + my ($rdir, $realfile) = host_netboot_file($ho, 'TemplatesReal'); + $realfile //= $file; + my $dirname = dirname $file; my $cmd = <{Tftp}{PxeGroup} $dirname $sudo chmod 2775 $dirname END - if ($pxefile ne $pxerealfile) { - my $subdirs = "../" x $pxefile =~ m#/#; + if ($file ne $realfile) { + my $subdirs = "../" x $file =~ m#/#; $cmd .= <