netboot: Change pxe to netboot in comments, docs and messages

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>

diff --git a/INSTALL.production b/INSTALL.production
index 2114ccc994a4f08922fa43a8931065e7c3828aa0..61ad095085bd00b82e68f69139f78032166cca59 100644 (file)
--- 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 5cd64336edf2477db8757f25034f0af7e8385bb4..4c73318fb1a9c5e09537d9d32826b61a5e6ef955 100644 (file)
--- 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 69e53a47bec347c2e67646c48767b359181272e0..231bf7db29ca4f7b1a882a57469edf5321a21738 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -2343,7 +2343,7 @@ sub create_webfile ($$$) {
     return $wf_url;
 }
 
-#---------- pxe handling ----------
+#---------- netboot handling ----------
 
 sub file_link_contents ($$$) {
     my ($fn, $contents, $stash) = @_;
@@ -2415,7 +2415,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)." ?";
 }
 
@@ -2474,7 +2474,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 e3519a48502c10e7c7da826352c679a293d84d01..f77922cfdc0235ec02ead55b596b5974cc2cc730 100644 (file)
--- 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 ed26df734b3c9b964563e56030704b5f101d7e3d..60b0742c8a25faa79235328b65623331e4ee6871 100755 (executable)
--- 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).
 #