[debian-lan-devel] [debian-lan] 04/05: Minor modifications and cosmetics. Merge FAI upstream.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 1a00a20d8c079a18fa3ddc5c8d3c4b37492caf6d
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Oct 21 16:57:49 2014 +0200

    Minor modifications and cosmetics. Merge FAI upstream.
    
    Fix false positive icinga warning related to gvfs.
---
 debian/README.Debian                                         | 1 +
 debian/control                                               | 2 +-
 fai/config/files/etc/fai/NFSROOT/FAISERVER                   | 1 +
 fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT | 2 +-
 fai/config/scripts/FAISERVER/50-di-netboot                   | 9 +++++----
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 67e7395..7cff104 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -19,6 +19,7 @@ Creating a CD image with fai-cd
 
 Create the CD image in the following way:
 
+   apt-get install aptitude  # needed for FAI
    aptitude install debian-lan-config  # might be already installed
    aptitude -R install fai-server xorriso # no recommends needed
    mkdir /srv/fai/
diff --git a/debian/control b/debian/control
index 54bc3a6..84410eb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian LAN Developers <debian-lan-devel at lists.alioth.debian.org>
 Uploaders: Andreas B. Mundt <andi at debian.org>
 Build-Depends: debhelper (>= 9.0.0)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://wiki.debian.org/DebianLAN
 Vcs-Git: git://anonscm.debian.org/collab-maint/debian-lan.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/debian-lan.git
diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index 6d5ecdd..cebb59e 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -13,6 +13,7 @@ console-common kbd
 iproute moreutils udev subversion
 xz-utils
 cupt
+pxelinux syslinux-common
 
 cfengine2
 # we need mkpasswd:
diff --git a/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT b/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
index 249e9df..7fc7e2f 100644
--- a/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
+++ b/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
@@ -5,7 +5,7 @@ command[check_apt]=/usr/lib/nagios/plugins/check_apt
 command[debian-lan_check_ntp_time]=/usr/lib/nagios/plugins/check_ntp_time -H ntp -w 0.5 -c 1
 command[debian-lan_check_procs]=/usr/lib/nagios/plugins/check_procs -w '150' -c '200'
 command[debian-lan_check_procs_zombie]=/usr/lib/nagios/plugins/check_procs -w '5' -c '10' -s Z
-command[debian-lan_check_all_disks]=/usr/lib/nagios/plugins/check_disk -w '20%' -c '10%' -e -l
+command[debian-lan_check_all_disks]=/usr/lib/nagios/plugins/check_disk -w '20%' -c '10%' -e -l -X fuse.gvfsd-fuse
 command[debian-lan_check_swap]=/usr/lib/nagios/plugins/check_swap -w '50%' -c '30%'
 command[debian-lan_check_load]=/usr/lib/nagios/plugins/check_load --warning='5.0,4.0,3.0' --critical='10.0,6.0,4.0'
 command[debian-lan_check_users]=/usr/lib/nagios/plugins/check_users -w '5' -c '10'
diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index 02b52d4..ac10cbf 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -9,7 +9,8 @@ if [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
     cat >> "${target}/etc/di-netboot-assistant/pxelinux.HEAD" <<EOF
 LABEL Local Boot
        MENU LABEL Boot from local hard disk
-       localboot 0
+       KERNEL chain.c32
+       APPEND hd0
 EOF
 
     if ifclass DISKLESS_SERVER ; then
@@ -17,8 +18,8 @@ EOF
 
 LABEL Debian-LAN Live System
        MENU LABEL Debian-LAN Live System
-       kernel ::/fai/vmlinuz
-       append initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
+       KERNEL ::/fai/vmlinuz
+       APPEND initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
 EOF
     fi
 
@@ -108,7 +109,7 @@ $ROOTCMD di-netboot-assistant rebuild-menu
 $ROOTCMD cp /usr/lib/syslinux/modules/bios/ldlinux.c32 /srv/tftp/debian-installer/
 $ROOTCMD cp /usr/lib/syslinux/modules/bios/libcom32.c32 /srv/tftp/debian-installer/
 $ROOTCMD cp /usr/lib/syslinux/modules/bios/libutil.c32 /srv/tftp/debian-installer/
-
+$ROOTCMD cp /usr/lib/syslinux/modules/bios/chain.c32 /srv/tftp/debian-installer/
 
 
 #wheezy:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git