Update /etc/grml/fai/config/scripts/GRMLBASE/25-locales and check for b0rken deps

diff --git a/buildd/functions.sh b/buildd/functions.sh
index c6f91fa..b8fb210 100755 (executable)
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -102,6 +102,10 @@ The following warnings have been noticed:
 
 $(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
 
+There following dependency problems have been noticed:
+
+$(grep -i "[Not Installed]" $FAI_LOGFILES/software.log || echo "* nothing")
+
 The following packages could not be installed:
 
 $(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")

diff --git a/debian/changelog b/debian/changelog
index 2c24ccd..66b5b01 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ grml-live (0.0.7) unstable; urgency=low
     always set - even when exiting with an error.
   * Check for presence of /bin/zsh before setting default shell in
     /etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+  * Check for locales/localepurge before using them in
+    /etc/grml/fai/config/scripts/GRMLBASE/25-locales
   * Add new packages to GRML_FULL:
     - bittwist
     - ldnsutils

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
index 73a4afd..ded06de 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales
+++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
@@ -4,11 +4,15 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Oct 15 20:34:53 CEST 2007 [mika]
+# Latest change: Sat Nov 03 12:01:12 CET 2007 [mika]
 ################################################################################
 
 set -e
 
+if [ -x $target/usr/sbin/localepurge ] ; then
+   $ROOTCMD dpkg-reconfigure localepurge
+fi
+
 # use full locales setup only in classes GRML_FULL and LOCALES
 if ifclass GRML_FULL || ifclass LOCALES ; then
    echo 'Using /etc/locale.gen.grml for locales generation'
@@ -18,7 +22,15 @@ else
    cp $target/etc/locale.gen.minimal $target/etc/locale.gen
 fi
 
-$ROOTCMD locale-gen
+if [ -x $target/usr/sbin/locale-gen ] ; then
+   $ROOTCMD locale-gen
+else
+   echo 'Warning: locale-gen [package locales] not available'
+fi
+
+if [ -x $target/usr/sbin/localepurge ] ; then
+   $ROOTCMD localepurge
+fi
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3