[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.7-14-g694bed9

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 694bed9a68bcf8067553a30f77976f471c900f28
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Jan 26 22:58:34 2013 +0100

    Write network configuration also when converting an installation.

diff --git a/fai/config/hooks/instsoft.SERVER_A.source b/fai/config/hooks/instsoft.SERVER_A.source
index c46f915..30542e4 100755
--- a/fai/config/hooks/instsoft.SERVER_A.source
+++ b/fai/config/hooks/instsoft.SERVER_A.source
@@ -6,8 +6,8 @@
 
 POLICYFILE="/usr/sbin/policy-rc.d"
 
-## Only do that when converting:
-if [ $CONVERT ] && [ "$target" == "/" ] && [ ! -e $POLICYFILE ] ; then
+## Only when converting:
+if $CONVERT && [ "$target" == "/" ] && [ ! -e $POLICYFILE ] ; then
     cat > $POLICYFILE <<EOF
 #!/bin/sh
 exit 101
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index 22e776f..9607ffe 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -31,7 +31,7 @@ fi
 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
+if [ "$FAI_ACTION" != "install" ] && ! $CONVERT ; then
     exit 0
 fi
 

-- 
Debian-LAN development and packaging