[OSSTEST PATCH 29/35] netboot: Rename TftpNetbootGroup (from TftpPxeGroup)

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

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

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

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index ed70579..f55729b 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -993,9 +993,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 9dcb65e..0e93f43 100644
--- 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 07283c8..831a6e1 100755
--- 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 1243d7c..cb35817 100644
--- 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 5aefe8f..1389698 100644
--- 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
 
-- 
2.1.4


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