Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

… b0rken deps
  • Loading branch information...
commit e85aa84c6bfddb8b8dd6af98d8ee4a4171c63e18 1 parent 856217a
Michael Prokop authored
4 buildd/functions.sh
@@ -102,6 +102,10 @@ The following warnings have been noticed:
102 102
103 103 $(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing")
104 104
  105 +There following dependency problems have been noticed:
  106 +
  107 +$(grep -i "[Not Installed]" $FAI_LOGFILES/software.log || echo "* nothing")
  108 +
105 109 The following packages could not be installed:
106 110
107 111 $(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing")
2  debian/changelog
@@ -51,6 +51,8 @@ grml-live (0.0.7) unstable; urgency=low
51 51 always set - even when exiting with an error.
52 52 * Check for presence of /bin/zsh before setting default shell in
53 53 /etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
  54 + * Check for locales/localepurge before using them in
  55 + /etc/grml/fai/config/scripts/GRMLBASE/25-locales
54 56 * Add new packages to GRML_FULL:
55 57 - bittwist
56 58 - ldnsutils
16 etc/grml/fai/config/scripts/GRMLBASE/25-locales
@@ -4,11 +4,15 @@
4 4 # Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
5 5 # Bug-Reports: see http://grml.org/bugs/
6 6 # License: This file is licensed under the GPL v2 or any later version.
7   -# Latest change: Mon Oct 15 20:34:53 CEST 2007 [mika]
  7 +# Latest change: Sat Nov 03 12:01:12 CET 2007 [mika]
8 8 ################################################################################
9 9
10 10 set -e
11 11
  12 +if [ -x $target/usr/sbin/localepurge ] ; then
  13 + $ROOTCMD dpkg-reconfigure localepurge
  14 +fi
  15 +
12 16 # use full locales setup only in classes GRML_FULL and LOCALES
13 17 if ifclass GRML_FULL || ifclass LOCALES ; then
14 18 echo 'Using /etc/locale.gen.grml for locales generation'
@@ -18,7 +22,15 @@ else
18 22 cp $target/etc/locale.gen.minimal $target/etc/locale.gen
19 23 fi
20 24
21   -$ROOTCMD locale-gen
  25 +if [ -x $target/usr/sbin/locale-gen ] ; then
  26 + $ROOTCMD locale-gen
  27 +else
  28 + echo 'Warning: locale-gen [package locales] not available'
  29 +fi
  30 +
  31 +if [ -x $target/usr/sbin/localepurge ] ; then
  32 + $ROOTCMD localepurge
  33 +fi
22 34
23 35 ## END OF FILE #################################################################
24 36 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3

0 comments on commit e85aa84

Please sign in to comment.
Something went wrong with that request. Please try again.