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

[Andreas B. Mundt]

The following commit has been merged in the squeeze branch:
commit 017408decd2f11badcfa51ae04d3fdabbd55a243
Author: Andreas B. Mundt <andi at debian.org>
Date:   Mon Aug 20 00:08:05 2012 +0200

    Make the config space a git repository and keep script.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index b0840c1..90e24f9 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -41,9 +41,19 @@ if wget --quiet --output-document=/tmp/fai-setup $URL ; then
 	fai-chboot -IFv workstation$NUMSTR  2>&1 | tee -a /var/log/fai/fai-chboot.log
 	NUM=$(($NUM+1))
     done
-    ## remove me, things are prepared now:
-    mv -v /etc/rc.local.pre_fcopy $0
 
+    ## Use git to track modifications of the config space:
+    cd $FAI_CONFIGDIR
+    git init
+    git add .
+    git commit -m "Initial commit"
+    cd -
+
+    if [ "$0" = "/etc/rc.local" ] ; then
+        ## things are prepared now, keep script for reference:
+	mv -v $0 $0_setup
+	mv -v /etc/rc.local.pre_fcopy $0
+    fi
     ## The following message is sed for diskless servers when fcopy'd:
     #DISKLESS_INFO
 
diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index 43d4656..053fcd6 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -3,3 +3,4 @@ fai-quickstart
 apt-cacher-ng
 tcpdump
 whois
+git
diff --git a/fai/config/scripts/FAISERVER/20-configspace b/fai/config/scripts/FAISERVER/20-configspace
index 5471c27..08a41af 100755
--- a/fai/config/scripts/FAISERVER/20-configspace
+++ b/fai/config/scripts/FAISERVER/20-configspace
@@ -2,12 +2,12 @@
 
 set -e
 
-if [ $FAI_ACTION == "install" ] ; then 
+if [ $FAI_ACTION == "install" ] ; then
     ## Copy the config space to the faiserver:
     echo -n "Cleaning config space ... "
     rm -rf $target/srv/fai/config
     echo "done."
-    
+
     cp -a /var/lib/fai/config $target/srv/fai/
     echo "New config space copied to faiserver."
 fi

-- 
Debian-LAN development and packaging