[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.9-11-g435db42

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 435db4206efe6a55b9006a65992c6fb1dd66fc7b
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Apr 26 23:37:44 2013 +0200

    Do not try to create link if it already exists.  Cleanup.
    
    Fix reported error/warning on FAI softupdate.
    Do not report warning about missing 'munin-conf.d/nodes.conf'.
    Do not modify '/etc/sysctl.conf', use '/etc/sysctl.d/'.

diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index d911925..b89fe5c 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -147,7 +147,7 @@ fi
 # do not create empty lines.
 myerrorpatterns="XXXXX"
 myignorepatterns="create mode
-/target/etc/munin/munin-conf.d/nodes.conf
+/etc/munin/munin-conf.d/nodes.conf
 EST: Table not found.
 ERST: Table is not found!
 WARNING! power/level is deprecated; use power/control instead
diff --git a/fai/config/scripts/FAIBASE/20-removable_media b/fai/config/scripts/FAIBASE/20-removable_media
index bac0658..2db7167 100755
--- a/fai/config/scripts/FAIBASE/20-removable_media
+++ b/fai/config/scripts/FAIBASE/20-removable_media
@@ -20,7 +20,7 @@ fstabline () {
 
 i=0
 for cdrom in $(cdromlist | tac); do
-    [ $i -eq 0 ] && ln -s cdrom0 $target/media/cdrom
+    [ $i -eq 0 ] && [ ! -L $target/media/cdrom/cdrom0 ] && ln -s cdrom0 $target/media/cdrom
     mkdir -p $target/media/cdrom$i
     fstabline /dev/$cdrom /media/cdrom$i udf,iso9660 ro,user,noauto 0 0
     i=$(($i + 1))
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index c152b9b..141678f 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -73,4 +73,6 @@ allow-hotplug eth1
 auto eth1
 iface eth1 inet dhcp
 EOF
+    ## Switch on forwarding:
+    ainsl -a ${target}/etc/sysctl.d/debian-lan.conf "net.ipv4.ip_forward=1"
 fi
diff --git a/fai/config/scripts/SERVER_A/30-forwarding b/fai/config/scripts/SERVER_A/30-forwarding
deleted file mode 100755
index 156d9ca..0000000
--- a/fai/config/scripts/SERVER_A/30-forwarding
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/sbin/cfagent -f
-
-control:
-   any::
-   actionsequence = ( editfiles )
-   EditFileSize = ( 30000 )
-
-editfiles:
-   any::
-	{ ${target}/etc/sysctl.conf
-	  ReplaceAll "#net.ipv4.ip_forward=1" With "net.ipv4.ip_forward=1" 
-	}
diff --git a/fai/config/scripts/SERVER_A/60-APTrepo_server b/fai/config/scripts/SERVER_A/60-APTrepo_server
index a907dac..aff72bc 100755
--- a/fai/config/scripts/SERVER_A/60-APTrepo_server
+++ b/fai/config/scripts/SERVER_A/60-APTrepo_server
@@ -6,7 +6,7 @@
 
 set -e
 
-if [ -z $APT_REPO_DIR ] ; then
+if [ -z "$APT_REPO_DIR" ] ; then
     exit 0
 fi
 
diff --git a/fai/config/scripts/SERVER_A/65-APTrepo_client b/fai/config/scripts/SERVER_A/65-APTrepo_client
index b1f2bd5..df18af6 100755
--- a/fai/config/scripts/SERVER_A/65-APTrepo_client
+++ b/fai/config/scripts/SERVER_A/65-APTrepo_client
@@ -5,7 +5,7 @@
 
 set -e
 
-if [ -z $APT_URL ] ; then
+if [ -z "$APT_URL" ] ; then
     exit 0
 fi
 

-- 
Debian-LAN development and packaging