[debian-lan-devel] [debian-lan] 04/06: Updates and fixes for stretch.

[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 3a16cb60ffcc5696bd619475a91f67b7626b1ab5
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Aug 5 09:23:54 2016 +0200

    Updates and fixes for stretch.
---
 debian/README.Debian                      |  9 +++++----
 fai/config/class/20-hwdetect.sh           | 14 ++++++++++----
 fai/config/hooks/savelog.LAST.sh          |  3 ++-
 fai/config/scripts/DEBIAN/20-capabilities |  2 +-
 fai/config/scripts/FAIBASE/10-misc        |  9 ++++++---
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 8febdb6..d255e51 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -21,7 +21,7 @@ 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
+   aptitude -R install fai-server xorriso binutils # no recommends needed
    mkdir /srv/fai/
    cp -r /usr/share/debian-lan-config/fai/config /srv/fai/
    cp -b /srv/fai/config/files/etc/fai/grub.cfg/SERVER_A /etc/fai/grub.cfg
@@ -47,9 +47,10 @@ The CD image is then created by fai-cd:
 Converting a minimal Debian installation
 ----------------------------------------
 
-Install a minimal Debian (only the core system) on the server.  Choose
-'mainserver' as hostname.  Prepare appropriate partitions, examples
-are available in /usr/share/debian-lan-config/fai/config/disk_config/.
+Install a minimal Debian (only the core system with standard system
+utilities) on the server.  Choose 'mainserver' as hostname.  Prepare
+appropriate partitions, examples are available in
+/usr/share/debian-lan-config/fai/config/disk_config/.
 
 Then convert the installation with the following commands:
 
diff --git a/fai/config/class/20-hwdetect.sh b/fai/config/class/20-hwdetect.sh
index 5bc3c52..df76ed4 100755
--- a/fai/config/class/20-hwdetect.sh
+++ b/fai/config/class/20-hwdetect.sh
@@ -2,8 +2,7 @@
 
 # (c) Thomas Lange, 2002-2013, lange at informatik.uni-koeln.de
 
-# NOTE: Files named *.source will be evaluated, but their output ignored. Instead
-# the contents of $newclasses will be added to the list of defined classes.
+# NOTE: Files named *.sh will be evaluated, but their output ignored.
 
 [ $do_init_tasks -eq 1 ] || return 0 # Do only execute when doing install
 
@@ -14,10 +13,11 @@ echo 0 > /proc/sys/kernel/printk
 case $(uname -r) in
     2.6*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;;
       3*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;;
+      4*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;;
 esac
 
 for mod in $kernelmodules; do
-    [ "$verbose" ] && echo Loading kernel module $mod
+    [ X$verbose = X1 ] && echo Loading kernel module $mod
     modprobe -a $mod 1>/dev/null 2>&1
 done
 
@@ -25,6 +25,12 @@ ip ad show up | egrep -iv 'loopback|127.0.0.1|::1/128|_lft'
 
 echo $printk > /proc/sys/kernel/printk
 
-set_disk_info  # calculate number of available disks
+odisklist=$disklist
+set_disk_info  # recalculate list of available disks
+if [ "$disklist" != "$odisklist" ]; then
+    echo New disklist: $disklist
+    echo disklist=\"$disklist\" >> $LOGDIR/additional.var
+fi
+
 save_dmesg     # save new boot messages (from loading modules)
 
diff --git a/fai/config/hooks/savelog.LAST.sh b/fai/config/hooks/savelog.LAST.sh
index 8f4232d..5d81dcb 100755
--- a/fai/config/hooks/savelog.LAST.sh
+++ b/fai/config/hooks/savelog.LAST.sh
@@ -166,7 +166,8 @@ Warning: you may need to reload your webservice!
 ldap_sasl_bind(SIMPLE): Can't contact LDAP server (-1)
 Resolving www.intern (www.intern)... failed: Name or service not known
 Enabling conf localized-error-pages
-plugins-bad"
+plugins-bad
+libpng warning: iCCP: known incorrect sRGB profile"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # The main routine
 errorpatterns="$globalerrorpatterns
diff --git a/fai/config/scripts/DEBIAN/20-capabilities b/fai/config/scripts/DEBIAN/20-capabilities
index 7de88d6..ea558de 100755
--- a/fai/config/scripts/DEBIAN/20-capabilities
+++ b/fai/config/scripts/DEBIAN/20-capabilities
@@ -7,7 +7,7 @@
 set -e
 
 if [ -x $target/sbin/setcap ] ; then
-    for FILE in /bin/ping /bin/ping6 /usr/bin/arping ; do
+    for FILE in /bin/ping /usr/bin/arping ; do
         if [ -x $target/$FILE ] ; then
             $ROOTCMD /sbin/setcap cap_net_raw+ep $FILE
         fi
diff --git a/fai/config/scripts/FAIBASE/10-misc b/fai/config/scripts/FAIBASE/10-misc
index f22cee8..f9cd4e3 100755
--- a/fai/config/scripts/FAIBASE/10-misc
+++ b/fai/config/scripts/FAIBASE/10-misc
@@ -5,14 +5,17 @@
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
 echo $TIMEZONE    > $target/etc/timezone
-cp -f /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
+[ -f $target/etc/localtime ] || ln -sv $target/usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
 
 if [ -n "$IPADDR" ]; then
-    ainsl -vs /etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
+    ifclass DHCPC || ainsl -s /etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
 else
-    ainsl -vs /etc/hosts "127.0.0.1 $HOSTNAME"
+    ifclass DHCPC && ainsl -s /etc/hosts "127.0.0.1 $HOSTNAME"
 fi
 
+if [ -f $target/etc/hosts.orig ]; then
+    mv $target/etc/hosts.orig $target/etc/hosts
+fi
 fcopy -iM /etc/hosts /etc/motd
 
 # make /root accessible only by root

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