netboot: Rename TftpNetbootGroup (from TftpPxeGroup)

This applies to NetGrub too.  Honour the old setting for
compatibility.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index c900df02beaf68a2897d78ac9bd63930491dace4..3123b40bb44b30cdeb3c5dae7e3b708fa6742081 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1004,9 +1004,11 @@ sub selecthost ($) {
     logm("TftpScope is $tftpscope");
     $ho->{Tftp} = { };
     $ho->{Tftp}{$_} = $c{"Tftp${_}_${tftpscope}"} || $c{"Tftp${_}"}
-        foreach qw(Path TmpDir PxeDir PxeGroup PxeTemplates PxeTemplatesReal
+        foreach qw(Path TmpDir PxeDir NetbootGroup PxeTemplates PxeTemplatesReal
                    DiBase GrubBase
-                   NetGrubDir NetGrubTemplates NetGrubTemplatesReal);
+                   NetGrubDir NetGrubTemplates NetGrubTemplatesReal
+                   PxeGroup);
+    $ho->{TftpNetbootGroup} //= $ho->{TftpPxeGroup}; # compatibility
 
     #----- finalise -----
 

diff --git a/README b/README
index 9dcb65ed1f3813ce56247b31295efe637a65c44b..0e93f43b2add2cf3ade11dea1857a812c7217c1a 100644 (file)
--- a/README
+++ b/README
@@ -504,7 +504,7 @@ Tftp*
     TftpNetGrubDir    The path under `Path' to the grub EFI netboot directory
                       Include the trailing /.
 
-    TftpPxeGroup      The Unix group which should own files under `PxeDir'
+    TftpNetbootGroup  The Unix group which should own files under `PxeDir'
                       and NetGrubDir.
 
     TftpPxeTemplates          } See below

diff --git a/mg-hosts b/mg-hosts
index 07283c84bb255a57dd8d55384ba4c2f366b9e4aa..831a6e171ea88ff75a63ecdbdab2edd438219dbb 100755 (executable)
--- a/mg-hosts
+++ b/mg-hosts
@@ -130,7 +130,7 @@ END
            $sudo mkdir -p $dirname
 END
         $cmd .= <<END;
-            $sudo chown root.$ho->{Tftp}{PxeGroup} $dirname
+            $sudo chown root.$ho->{Tftp}{NetbootGroup} $dirname
             $sudo chmod 2775 $dirname
 END
         if ($file ne $realfile) {

diff --git a/production-config b/production-config
index 1243d7cecf8ae7186d413948aba1a9adbf915dfe..cb35817a3a2b8c1bf0a43c07b8198ab170c2a6fd 100644 (file)
--- a/production-config
+++ b/production-config
@@ -88,7 +88,7 @@ TftpNetGrubDir /
 TftpNetGrubTemplates %name%/netgrub.cfg
 TftpNetGrubTemplatesReal Netgrub.cfg/%ether%
 
-TftpPxeGroup osstest
+TftpNetbootGroup osstest
 # Update with ./mg-debian-installer-update(-all)
 TftpDiVersion_wheezy 2016-06-08
 TftpDiVersion_jessie 2017-01-16

diff --git a/production-config-cambridge b/production-config-cambridge
index 5aefe8f80305ad1934176fb11fcfb8ee20779d74..1389698c647935f9cb8c29c3a02dc3a768240291 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -71,7 +71,7 @@ TftpNetGrubDir /
 TftpNetGrubTemplates %name%/netgrub.cfg
 TftpNetGrubTemplatesReal Netgrub.cfg/%ether%
 
-TftpPxeGroup osstest
+TftpNetbootGroup osstest
 TftpDiVersion_wheezy 2016-06-08
 TftpDiVersion_jessie 2017-01-16