[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-54-ge787d4f

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 0abb90f186f79b37d6371131c9e78e7613630584
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Nov 2 15:11:09 2012 +0100

    Fix permissions and path for nbd swap server.
    
    The nbd-server runs as user nbd and needs to be able to run nbdswapd.
    The path '/usr/local/sbin/' is not in $PATH when started from the init
    script.

diff --git a/fai/config/files/etc/nbd-server/conf.d/swap.conf/DISKLESS_SERVER b/fai/config/files/etc/nbd-server/conf.d/swap.conf/DISKLESS_SERVER
index 5c98e0f..333bdc5 100644
--- a/fai/config/files/etc/nbd-server/conf.d/swap.conf/DISKLESS_SERVER
+++ b/fai/config/files/etc/nbd-server/conf.d/swap.conf/DISKLESS_SERVER
@@ -1,4 +1,4 @@
 [swap]
 exportname = /tmp/nbd-swap/%s
-prerun = nbdswapd %s
+prerun = /usr/local/sbin/nbdswapd %s
 postrun = rm -f %s
diff --git a/fai/config/scripts/DISKLESS_SERVER/10-setup b/fai/config/scripts/DISKLESS_SERVER/10-setup
index 17d16a6..fc51208 100755
--- a/fai/config/scripts/DISKLESS_SERVER/10-setup
+++ b/fai/config/scripts/DISKLESS_SERVER/10-setup
@@ -3,7 +3,7 @@
 # setup the diskless+swap server
 #
 
-fcopy -m root,root,0755 /usr/sbin/nbdswapd
+fcopy /usr/local/sbin/nbdswapd
 fcopy /etc/nbd-server/conf.d/swap.conf
 
 ainsl /etc/exports "/opt              ${SUBNETMASK}(async,ro,no_subtree_check,no_root_squash)"
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index b9d2fdf..159ba06 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
 
 if [ $FAI_ACTION != "install" ]; then
     exit 0

-- 
Debian-LAN development and packaging