[OSSTEST PATCH 18/35] netboot: Change pxe to netboot in comments, docs and messages

[Ian Jackson <ian.jackson@eu.citrix.com>]

UEFI grub netbooting is not PXE.  Indeed PXE is a BIOS thing only.

No functional change other than to messages.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 INSTALL.production     | 10 +++++-----
 Osstest/Debian.pm      |  2 +-
 Osstest/TestSupport.pm |  6 +++---
 README                 |  4 ++--
 mg-hosts               |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/INSTALL.production b/INSTALL.production
index 2114ccc..61ad095 100644
--- a/INSTALL.production
+++ b/INSTALL.production
@@ -59,8 +59,8 @@ OwnerDaemonHost and QueueDaemonHost configuration options. If they
 happen to run on the same host then setting ControlDaemonHost will
 configure both in one go.
 
-DHCP AND PXE
-------------
+DHCP AND TFTP (eg PXE)
+----------------------
 
 osstest does not require a dedicated DHCP server but one must be
 present on the network and osstest requires access to its leases
@@ -69,9 +69,9 @@ to which will dump the lease file. This is configured via the
 DhcpWatchMethod host prop (default configured via
 HostProp_DhcpWatchMethod)
 
-Likewise osstest does not require a dedicated PXE server but one must
-exist on the network and be accessible via a local path on the osstest
-control VM (e.g. over NFS)
+Likewise osstest does not require a dedicated TFTP (netboot) server
+but one must exist on the network and be accessible via a local path
+on the osstest control VM (e.g. over NFS)
 
 CONFIGURATION
 =============
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 5cd6433..4c73318 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1278,7 +1278,7 @@ END
     if (get_host_property($ho, "firmware",'') eq "uefi") {
 	die unless $ho->{Suite} =~ m/jessie|stretch/;
 	# Prevent grub-install from making a new Debian boot entry, so
-	# we always reboot from PXE. Debian bug #789798 proposes a
+	# we always reboot from the network. Debian bug #789798 proposes a
 	# properly preseedable solution to this.
 	preseed_hook_installscript($ho, $sfx,
 		'/usr/lib/base-installer.d/',
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 9dbf1a7..fde796a 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -2332,7 +2332,7 @@ sub create_webfile ($$$) {
     return $wf_url;
 }
 
-#---------- pxe handling ----------
+#---------- netboot handling ----------
 
 sub file_link_contents ($$$) {
     my ($fn, $contents, $stash) = @_;
@@ -2404,7 +2404,7 @@ sub host_netboot_file ($;$) {
 	# and return the first pattern we managed to completely substitute
         return wantarray ? ($dir,$pat) : $dir.$pat;
     }
-    die "no pxe template ($templatekey) matched $templates ".
+    die "no netboot template ($templatekey) matched $templates ".
         (join ",", sort keys %v)." ?";
 }
 
@@ -2463,7 +2463,7 @@ sub setup_grub_efi_bootcfg ($$) {
 		       $bootfile,  hostnamepath($ho)."-pxegrub.cfg");
 }
 
-# UEFI systems PXE boot using grub.efi
+# UEFI systems netboot using grub.efi
 sub setup_netboot_di_uefi ($$$$$;%) {
     my ($ho,$kern,$initrd,$dicmd,$hocmd,%xopts) = @_;
     setup_grub_efi_bootcfg($ho, <<END);
diff --git a/README b/README
index e3519a4..f77922c 100644
--- a/README
+++ b/README
@@ -296,7 +296,7 @@ To run osstest in standalone mode:
    so you need to insert those missing runvars into standalone.db with
    sqlite3.
 
- - Don't forget to set the machine to pxeboot in the BIOS.
+ - Don't forget to set the machine to netboot in the BIOS.
 
  - Currently you need a serial console at 115200 8n1; see TODO.
 
@@ -508,7 +508,7 @@ Tftp*
     TftpDiBase        The path under `Path' to the root of the debian
                       installer images.
     TftpGrubBase      The path under `Path' to the root of the grub
-                      EFI PXE images.
+                      EFI netboot images.
 
 Tftp<setting>_<scope>
 
diff --git a/mg-hosts b/mg-hosts
index ed26df7..60b0742 100755
--- a/mg-hosts
+++ b/mg-hosts
@@ -20,7 +20,7 @@
 # Usages:
 #
 #  ./mg-hosts mkpxedir HOST...
-#               Create directories for pxeboot as expected by the rest
+#               Create directories for netboot as expected by the rest
 #               of osstest.  Will use "sudo". The HOST(s) must be
 #               allocated (via mg-allocate HOST).
 #
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel