[OSSTEST,19/35] netboot: Change pxe to netboot in variable names

Commit Message

Ian Jackson Jan. 20, 2017, 12:19 p.m. UTC

No functional change.

Signed-off-by: Ian Jackson <[e-mail]>
---
 Osstest/TestSupport.pm |  6 +++---
 mg-hosts               | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

Patch

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 = <<END;
             set -e
            cd $dir
@@ -133,10 +133,10 @@  END
             $sudo chown root.$ho->{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 .= <<END;
-	    $sudo ln -sf $subdirs$pxefile $pxerealfile
+	    $sudo ln -sf $subdirs$file $realfile
 END
         }
         print $cmd;