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

[Andreas B. Mundt]

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

    Make the config space a git repository.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index ff45b71..f32cdcb 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -42,6 +42,13 @@ if wget --quiet --output-document=/tmp/fai-setup $URL ; then
 	NUM=$(($NUM+1))
     done
 
+    ## 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
diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index 543b574..dd5875b 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -10,3 +10,4 @@ syslinux-common
 
 apt-cacher-ng
 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