[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, squeeze, updated. 0.7squeeze-6-g2c06d0d

[Andreas B. Mundt]

The following commit has been merged in the squeeze branch:
commit 2c06d0de39eb772d54f7b1d3778bbbf7f486e610
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.
    (cherry picked from commit 694bed9a68bcf8067553a30f77976f471c900f28)
    
    Conflicts:
    	fai/config/scripts/SERVER_A/10-misc

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 d4db529..8de661d 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -33,7 +33,7 @@ cat > $target/etc/apt/apt.conf.d/proxy <<EOF
 Acquire::http::Proxy "http://aptcache.intern:3142/";
 EOF
 
-if [ $FAI_ACTION != "install" ]; then
+if [ "$FAI_ACTION" != "install" ] && ! $CONVERT ; then
     exit 0
 fi
 

-- 
Debian-LAN development and packaging