[Xen-devel] [OSSTEST PATCH 17/35] netboot: Rename pxeboot functions

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

 git-ls-files | xargs perl -i~ -pe 's/\bsetup_pxeboot_/setup_netboot_/g'
 git-ls-files | xargs perl -i~ -pe 's/\bsetup_pxelinux_/setup_netboot_/g'

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Osstest/TestSupport.pm | 28 ++++++++++++++--------------
 ts-host-install        |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 54ff552..9dbf1a7 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -115,7 +115,7 @@ BEGIN {
 
                       await_webspace_fetch_byleaf create_webfile
                       file_link_contents get_timeout
-                      setup_pxeboot_di setup_pxeboot_local host_netboot_file
+                      setup_netboot_di setup_netboot_local host_netboot_file
 
                       ether_prefix
 
@@ -2408,7 +2408,7 @@ sub host_netboot_file ($;$) {
         (join ",", sort keys %v)." ?";
 }
 
-sub setup_pxelinux_bootcfg ($$) {
+sub setup_netboot_bootcfg ($$) {
     my ($ho, $bootfile) = @_;
     my $f= host_netboot_file($ho);
     file_link_contents("$ho->{Tftp}{Path}$f", $bootfile,
@@ -2416,10 +2416,10 @@ sub setup_pxelinux_bootcfg ($$) {
 }
 
 # Systems using BIOS are configured to use pxelinux
-sub setup_pxeboot_di_bios ($$$$$;%) {
+sub setup_netboot_di_bios ($$$$$;%) {
     my ($ho,$kern,$initrd,$dicmd,$hocmd,%xopts) = @_;
     my $dtbs = $xopts{dtbs} ? "fdtdir $xopts{dtbs}" : "";
-    setup_pxelinux_bootcfg($ho, <<END);
+    setup_netboot_bootcfg($ho, <<END);
     serial 0 $c{Baud}
 timeout 5
 label overwrite
@@ -2433,9 +2433,9 @@ default overwrite
 END
 }
 
-sub setup_pxeboot_local_bios ($) {
+sub setup_netboot_local_bios ($) {
     my ($ho) = @_;
-    setup_pxelinux_bootcfg($ho, <<END);
+    setup_netboot_bootcfg($ho, <<END);
 serial 0 $c{Baud}
 timeout 5
 label local
@@ -2445,8 +2445,8 @@ END
 }
 
 # uboot emulates pxelinux, so reuse BIOS stuff
-sub setup_pxeboot_di_uboot ($$$$$;%) { return &setup_pxeboot_di_bios; }
-sub setup_pxeboot_local_uboot ($) { return &setup_pxeboot_local_bios; }
+sub setup_netboot_di_uboot ($$$$$;%) { return &setup_netboot_di_bios; }
+sub setup_netboot_local_uboot ($) { return &setup_netboot_local_bios; }
 
 sub setup_grub_efi_bootcfg ($$) {
     my ($ho, $bootfile) = @_;
@@ -2464,7 +2464,7 @@ sub setup_grub_efi_bootcfg ($$) {
 }
 
 # UEFI systems PXE boot using grub.efi
-sub setup_pxeboot_di_uefi ($$$$$;%) {
+sub setup_netboot_di_uefi ($$$$$;%) {
     my ($ho,$kern,$initrd,$dicmd,$hocmd,%xopts) = @_;
     setup_grub_efi_bootcfg($ho, <<END);
 set default=0
@@ -2476,7 +2476,7 @@ menuentry 'overwrite' {
 END
 }
 
-sub setup_pxeboot_local_uefi ($) {
+sub setup_netboot_local_uefi ($) {
     my ($ho) = @_;
     my %efi_archs = qw(amd64 X64
                        arm32 ARM
@@ -2499,20 +2499,20 @@ menuentry 'local' {
 END
 }
 
-sub setup_pxeboot_local ($) {
+sub setup_netboot_local ($) {
     my ($ho) = @_;
     my $firmware = get_host_property($ho, "firmware", "bios");
     $firmware =~ s/-/_/g;
     no strict qw(refs);
-    return &{"setup_pxeboot_local_${firmware}"}($ho);
+    return &{"setup_netboot_local_${firmware}"}($ho);
 }
 
-sub setup_pxeboot_di ($$$$$;%) {
+sub setup_netboot_di ($$$$$;%) {
     my ($ho,$kern,$initrd,$dicmd,$hocmd,%xopts) = @_;
     my $firmware = get_host_property($ho, "firmware", "bios");
     $firmware =~ s/-/_/g;
     no strict qw(refs);
-    return &{"setup_pxeboot_di_${firmware}"}($ho,$kern,$initrd,
+    return &{"setup_netboot_di_${firmware}"}($ho,$kern,$initrd,
                                             join(' ',@{$dicmd}),
                                             join(' ',@{$hocmd}),
                                             %xopts);
diff --git a/ts-host-install b/ts-host-install
index 770c51b..e151c5b 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -66,7 +66,7 @@ d-i netcfg/get_hostname string $ho->{Name}
 d-i netcfg/get_ipaddress string $ho->{Ip}
 END
 
-    setup_pxeboot_firstboot($ps_url);
+    setup_netboot_firstboot($ps_url);
     power_cycle_sleep($ho);
 
     my $logtailer= Osstest::Logtailer->new($c{WebspaceLog});
@@ -82,7 +82,7 @@ END
        exit 0;
     }
 
-    setup_pxeboot_local($ho);
+    setup_netboot_local($ho);
 
     await_tcp(get_timeout($ho,'reboot',$timeout{Sshd}), 14,$ho);
 
@@ -154,7 +154,7 @@ END
     logm('OK: install completed');
 }   
 
-sub setup_pxeboot_firstboot($) {
+sub setup_netboot_firstboot($) {
     my ($ps_url) = @_;
     
     my $d_i= 
$ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'.$ho->{DiVersion}.'-'.$ho->{Suite};
@@ -275,7 +275,7 @@ END
         get_host_property($ho, "linux-boot-append $ho->{Suite} $r{arch}", '');
 
     $xopts{ipappend} = $ipappend;
-    setup_pxeboot_di($ho, $kernel, "/$initrd", \@dicmdline, \@hocmdline,
+    setup_netboot_di($ho, $kernel, "/$initrd", \@dicmdline, \@hocmdline,
                     %xopts);
 }
 
-- 
2.1.4


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