X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F01-packages;h=3033c72fb26023548291d81200eb2794f16d3318;hb=c9ebd4a91cada380bc8d65ea75c5f09da3a89630;hp=9dc2aade29f80cb1257dc0a0d95ead24f35ee50d;hpb=0f85d1ba6a21ba9426fcf3c867227e48573e4cdf;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 9dc2aad..3033c72 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/01-packages
+++ b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/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>
@@ -13,14 +13,16 @@ 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.txt)\n"
+      printf "failed (there have been errors, find them at $LOGDIR/package_errors.log)\n"
    fi
 fi