X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F01-packages;h=b5985166b91791202672f8ed3eb21f099ea33c46;hb=e13f6a8e039735faf767a7fec63474d54b7c79b2;hp=1a1a3356fbbee0fa32b9b8d69aec3465b4f4da2c;hpb=4b2e8632eba4fa2343986f897cfcd59ed1413d66;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/01-packages b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
index 1a1a335..b598516 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/01-packages
+++ b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/01-packages
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/01-packages
 # Purpose:       check for packages that have been requested but could not be installed
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -13,11 +13,13 @@ set -e
 [ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
 
 
-if ! [ -r "$target/tmp/packages.list" ] ; then
-   echo "No $target/tmp/packages.list found, will not run package validation check."
+PACKAGE_LIST=/var/log/install_packages.list
+
+if ! [ -r "$target/${PACKAGE_LIST}" ] ; then
+   echo "No $target/${PACKAGE_LIST} found, will not run package validation check."
 else
    printf "Validating package list: "
-   if $ROOTCMD dpkg --list $(grep -v '^#' $target/tmp/packages.list) >/dev/null 2>$LOGDIR/package_errors.log ; then
+   if $ROOTCMD dpkg --list $(grep -v '^#' $target/${PACKAGE_LIST} | grep -v -- '-$') >/dev/null 2>$LOGDIR/package_errors.log ; then
       printf "done - no errors found\n"
    else
       printf "failed (there have been errors, find them at $LOGDIR/package_errors.log)\n"
@@ -25,4 +27,4 @@ else
 fi
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2