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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit ee4a540ea8682e9a1f5e083ec78fb1a1a1580cc1
Author: Andreas B. Mundt <andi at debian.org>
Date:   Wed Apr 24 16:05:55 2013 +0200

    Small fixes/improvements:  Typo, report errors, time stamp format.
    
    Fix a typo/misspelling in 'debian/control'.
    Thanks to Michael Welsh Duggan (Closes #705891).
    
    Report all 'errors' after installation.  Thanks to Andreas
    Schockenhoff for the suggestion.  Add list of false positives.
    
    Use a shorter format for the time stamp to keep the file name
    compact.

diff --git a/debian/control b/debian/control
index 78f8d6a..a5e94e9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${misc:Depends}
 Suggests: fai-server
 Description: FAI config space for the Debian-LAN system
  The Debian-LAN (Debian Local Area Network) project makes running
- Debian in a local area network easy without loosing flexibility.
+ Debian in a local area network easy without losing flexibility.
  It may be used by schools, work groups, associations and small
  enterprises or to install complex test environments.
  .
diff --git a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
index 00a6e52..b337123 100755
--- a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
+++ b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
@@ -10,7 +10,7 @@ DATADIR="/root/installation/"
 HOSTNAME=`hostname -s`
 HOME="/lan/$HOSTNAME/home0"
 DHCPCONF="/etc/dhcp/dhcpd.conf"
-DATE=`date +%F`
+DATE=`date +%Y%m%d`
 
 ## Password restrictions (compliant with kerberos policy):
 MINLEN=4  # minimal password length (max 8 with slappasswd as password generator)
diff --git a/fai/config/files/usr/local/sbin/dhcpd-keytab/SERVER_A b/fai/config/files/usr/local/sbin/dhcpd-keytab/SERVER_A
index 06bf0eb..80a4571 100755
--- a/fai/config/files/usr/local/sbin/dhcpd-keytab/SERVER_A
+++ b/fai/config/files/usr/local/sbin/dhcpd-keytab/SERVER_A
@@ -59,7 +59,7 @@ for i in `seq 8` ; do
         continue
     fi
     echo "$DATADIR/${MACHINE}.keytab copied to ${MACHINE}."
-    DATE=`date +%F`
+    DATE=`date +%Y%m%d`
     mv -v $DATADIR/${MACHINE}.keytab $DATADIR/${MACHINE}.keytab_$DATE
     cleanup "Success! ${MACHINE} activated."
 done
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index 183fbb7..d911925 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -146,7 +146,19 @@ fi
 # Here you can define your own patterns. Put one pattern in a line,
 # do not create empty lines.
 myerrorpatterns="XXXXX"
-myignorepatterns="create mode"
+myignorepatterns="create mode
+/target/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
+Opts: errors=remount-ro
+Warning: no domain name configured, using "localdomain"
+CUPS failed to reload its configuration!
+Warning: you may need to reload your webservice!
+/boot/grub/video.lst: No such file or directory
+/boot/grub/video.lst: No such file or directory
+ldap_sasl_bind(SIMPLE): Can't contact LDAP server (-1)
+Resolving www.intern (www.intern)... failed: Name or service not known."
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # The main routine
 errorpatterns="$globalerrorpatterns
@@ -167,7 +179,10 @@ if [ "$verbose" ]; then
 fi
 
 if [ -s $errfile ]; then
-   echo "ERRORS found in log files. See $errfile" >&2
+   echo "ERRORS reported in ${errfile}:"
+   cat $errfile | nl
+   echo "ERRORS found in log files. See above and $errfile" >&2
+
 else
    echo "Congratulations! No errors found in log files."
 fi

-- 
Debian-LAN development and packaging