[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, squeeze, updated. 0.6-35-g5748cf8

[Andreas B. Mundt]

The following commit has been merged in the squeeze branch:
commit 37666c258161d4913a2fc66fe6fa1e920cc7bee7
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Nov 2 19:41:12 2012 +0100

    Fix permissions and path for nbd swap server.

diff --git a/fai/config/scripts/DISKLESS_SERVER/10-setup b/fai/config/scripts/DISKLESS_SERVER/10-setup
index 9c0dee3..76a3634 100755
--- a/fai/config/scripts/DISKLESS_SERVER/10-setup
+++ b/fai/config/scripts/DISKLESS_SERVER/10-setup
@@ -3,9 +3,9 @@
 # setup the diskless+swap server
 #
 
-fcopy -m root,root,0755 /usr/sbin/nbdswapd
+fcopy /usr/local/sbin/nbdswapd
 
-$ROOTCMD update-inetd --add "9572 stream tcp nowait nobody /usr/sbin/tcpd /usr/sbin/nbdswapd"
+$ROOTCMD update-inetd --add "9572 stream tcp nowait nobody /usr/sbin/tcpd /usr/local/sbin/nbdswapd"
 
 ainsl $target/etc/exports     "/opt              ${SUBNETMASK}(async,ro,no_subtree_check,no_root_squash)"
 ainsl $target/etc/hosts.allow "nbdswapd: ALL: keepalive"
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index d82019e..d4db529 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -25,8 +25,8 @@ if ifclass FAISERVER ; then
 fi
 
 ## Make debian-lan-scripts available:
-
-fcopy -rm root,root,0700 /usr/local/sbin/
+fcopy -m root,root,0700 /usr/local/sbin/debian-lan
+fcopy -m root,root,0700 /usr/local/sbin/dhcpd-keytab
 
 ## Use apt-cacher-ng as proxy for APT:
 cat > $target/etc/apt/apt.conf.d/proxy <<EOF

-- 
Debian-LAN development and packaging