[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.8-11-gdcd1d9a

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit dcd1d9a089630111732732922ffc28496e86ed97
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Mar 26 09:23:30 2013 +0100

    Remove munin disk checks for diskless clients.
    
    The network block device is monitored as swap already.

diff --git a/debian/changelog b/debian/changelog
index f9bf35a..627ea33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-lan-config (0.10) UNRELEASED; urgency=low
+
+  * Munin for diskless clients:  Remove disk checks.
+
+ -- Andreas B. Mundt <andi at debian.org>  Mon, 25 Mar 2013 16:47:28 +0100
+
 debian-lan-config (0.9) experimental; urgency=low
 
   * Initial packaged release.
diff --git a/fai/config/scripts/DISKLESS_CLIENT/20-munin.conf b/fai/config/scripts/DISKLESS_CLIENT/20-munin.conf
index ea7a0bd..fcd9b90 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/20-munin.conf
+++ b/fai/config/scripts/DISKLESS_CLIENT/20-munin.conf
@@ -16,9 +16,6 @@ fi
 rm $target/etc/munin/plugins/*
 
 $ROOTCMD ln -s '/usr/share/munin/plugins/cpu' '/etc/munin/plugins/cpu'
-$ROOTCMD ln -s '/usr/share/munin/plugins/df' '/etc/munin/plugins/df'
-$ROOTCMD ln -s '/usr/share/munin/plugins/df_inode' '/etc/munin/plugins/df_inode'
-$ROOTCMD ln -s '/usr/share/munin/plugins/diskstats' '/etc/munin/plugins/diskstats'
 $ROOTCMD ln -s '/usr/share/munin/plugins/entropy' '/etc/munin/plugins/entropy'
 $ROOTCMD ln -s '/usr/share/munin/plugins/forks' '/etc/munin/plugins/forks'
 $ROOTCMD ln -s '/usr/share/munin/plugins/fw_packets' '/etc/munin/plugins/fw_packets'

-- 
Debian-LAN development and packaging