[debian-edu-commits] debian-edu/ 01/01: cf/cf.ltsp: Move tftpd related code to debian.server|ltspserve just in case a pure main server is used for installations via PXE.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 92e3af380a7f4bbd2734d77abad6bd64c5a775d8
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Aug 22 02:23:41 2016 +0200

    cf/cf.ltsp: Move tftpd related code to debian.server|ltspserve just in case a pure main server is used for installations via PXE.
---
 cf/cf.ltsp       | 31 +++++++++++++++----------------
 debian/changelog |  2 ++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/cf/cf.ltsp b/cf/cf.ltsp
index d4d6152..19484d2 100644
--- a/cf/cf.ltsp
+++ b/cf/cf.ltsp
@@ -45,6 +45,20 @@ editfiles:
          ReplaceAll "local_only = false" With "local_only = true"
     }
 
+    # Make the tftp-daemon run change-rooted (-s switch) using the standard
+    # ltsp directory as root. Very messy otherwise.
+    
+    { /etc/inetd.conf
+       BeginGroupIfNoMatch "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd -s /tftpboot"
+         ReplaceAll "\/var\/ftpd" With "-s /tftpboot"
+       EndGroup
+    }
+
+    # Make tftpd-hpa work with multiple subdirs in tftp root dir
+    { /etc/default/tftpd-hpa
+      HashCommentLinesContaining '--secure'
+    }
+
   debian.ltspserver::
 
     # The file /etc/default/isc-dhcp-server controls what interface the dhcp
@@ -60,26 +74,11 @@ editfiles:
     #
     # Make sure this is synced with cf.dhcpserver
 
-    
+
     { /etc/default/isc-dhcp-server
       AppendIfNoSuchLine 'INTERFACESv4="$INTERFACESv4 eth1"'
     }
 
-
-    # Make the tftp-daemon run change-rooted (-s switch) using the standard
-    # ltsp directory as root. Very messy otherwise.
-    
-    { /etc/inetd.conf
-       BeginGroupIfNoMatch "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd -s /tftpboot"
-         ReplaceAll "\/var\/ftpd" With "-s /tftpboot"
-       EndGroup
-    }
-
-    # Make tftpd-hpa work with multiple subdirs in tftp root dir
-    { /etc/default/tftpd-hpa
-      HashCommentLinesContaining '--secure'
-    }
-
     # Set up NFS config file to allow thin clients to mount their 
     # root file system and the swap files.
     # FIXME: Modify network definition to revert to 255.255.254.0 netmask: 
diff --git a/debian/changelog b/debian/changelog
index e0998be..60b6563 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ debian-edu-config (1.909) UNRELEASED; urgency=medium
   * Fix testsuite/samba to actually report success if 'net time' is working.
   * Adjust testsuite/pxeinstall now that atftpd isn't available and tftpd-hpa
     is used.
+  * cf/cf.ltsp: Move tftpd related code to debian.server|ltspserve just in
+    case a pure main server is used for installations via PXE.
 
  -- Holger Levsen <holger at debian.org>  Fri, 19 Aug 2016 12:46:37 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git