Changes to how PXE/TFTP is rolled out, it is now part of the base-requires step

3 files changed, 6 insertions, 5 deletions

diff --git a/tools/make-base-requires.sh b/tools/make-base-requires.sh
index d19ffd9..1cd5653 100755
--- a/tools/make-base-requires.sh
+++ b/tools/make-base-requires.sh
@@ -57,4 +57,7 @@ ssh -l root ${SECONDARY} "echo THIS COPY OF TGMANAGE IS MANAGED FROM BOOTSTRAP S
 # No point in _not_ running update-baseservice at this point....
 tools/update-baseservice.sh ${BASE}
 
+# Set up PXE environment. NOTE that we assume that TFTP-server is the ${SECONDARY} (changed from older behaviour)
+ssh -l root ${SECONDARY} "~/tgmanage/tools/make-pxeboot.sh"
+
 # all done.
diff --git a/tools/make-pxeboot.sh b/tools/make-pxeboot.sh
index 0d53e6a..3f1358d 100755
--- a/tools/make-pxeboot.sh
+++ b/tools/make-pxeboot.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# TODO: This tool assumes that the bootstrap box
-# is used as the PXE server. This should be updated
-# to use the configuration information in config.local.pm ...
+# This tool is to be executed by make-base-requires.sh
+# From tg14 we assume that TFTP server/PXE-boot server
+# is the Secondary/SMTP/TFTP box.
 
 apt-get install tftpd-hpa
 apt-get install nfs-kernel-server
diff --git a/tools/make-reverse4-files.pl b/tools/make-reverse4-files.pl
index a47e93f..db4a1bf 100755
--- a/tools/make-reverse4-files.pl
+++ b/tools/make-reverse4-files.pl
@@ -61,8 +61,6 @@ my $noc_nett_v6 = $nms::config::noc_nett_v6;
 
 my $ddns_to = $nms::config::ddns_to;
 
-my $pxe_server = $nms::config::ddns_to;
-
 my $base_ipv4 = new Net::IP( $base_ipv4net . "/" . $base_ipv4prefix );
 
 $base_ipv4net =~ m/^(\d+)\.(\d+)\.(\d+)\..*/;