[debian-edu-commits] debian-edu/ 01/01: cf.ltsp: Adjust setting for isc-dhcp-server. Make tftpd-hpa work with multiple subdirs in tftp root dir.

[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 8a9e7db8b9510937c3e9a84e15980ed9fb64b602
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Apr 15 21:47:12 2016 +0200

    cf.ltsp: Adjust setting for isc-dhcp-server. Make tftpd-hpa work with multiple subdirs in tftp root dir.
---
 cf/cf.ltsp       | 7 ++++++-
 debian/changelog | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cf/cf.ltsp b/cf/cf.ltsp
index 92421c8..2494bf5 100644
--- a/cf/cf.ltsp
+++ b/cf/cf.ltsp
@@ -62,7 +62,7 @@ editfiles:
 
     
     { /etc/default/isc-dhcp-server
-      AppendIfNoSuchLine 'INTERFACES="$INTERFACES eth1"'
+      AppendIfNoSuchLine 'INTERFACESv4="$INTERFACES eth1"'
     }
 
 
@@ -75,6 +75,11 @@ editfiles:
        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 1050d3d..ff8aae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ debian-edu-config (1.901) UNRELEASED; urgency=medium
     will break cups-daemon on upgraded networked systems as well if the new
     LDAP entry for printer-admins isn't added manually. So go back to the
     default and leave the decision about the SystemGroup to the local admin.
+  * cf.ltsp:
+    - Adjust setting for isc-dhcp-server.
+    - Make tftpd-hpa work with multiple subdirs in tftp root dir.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
 

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