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

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/01-packages b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
index b598516..aae58ae 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/01-packages
+++ b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
@@ -9,21 +9,52 @@
 set -u
 set -e
 
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+echo -n > "${LOGDIR}"/package_errors.log  # ensure we start with an empty file
 
+if ! [ -e "${LOGDIR}"/software.log ] ; then
+  echo "Warning: no ${LOGDIR}/software.log found (build/update run?), skipping check for unknown packages."
+else
+  if grep -q 'These unknown packages' "${LOGDIR}"/software.log ; then
+    echo "Identified unknown packages in ${LOGDIR}/software.log"
+    grep 'These unknown packages' "${LOGDIR}"/software.log | \
+      sed 's/.*These unknown packages.*: //; s/ / not_installable\n/g' >> "${LOGDIR}/package_errors.log"
+  fi
+fi
 
 PACKAGE_LIST=/var/log/install_packages.list
+# shellcheck disable=SC2154
+if ! [ -r "${target}/${PACKAGE_LIST}" ] ; then
+  echo "No ${target}/${PACKAGE_LIST} found, will not run package validation check."
+else
+  echo "Validating package list against dpkg state..."
+
+  TMPSTDOUT=$(mktemp)
+  TMPSTDERR=$(mktemp)
+
+  # 1) catch packages that aren't in state 'ii' (marked for installation
+  # and successfully instead) on stdout
+  # 2) catch error messages like 'dpkg-query: no packages found matching $package"
+  # for packages unknown to dpkg on stderr
+  # NOTE: 'grep -v -- '-$' ignores packages in FAI's package list that are
+  # marked for removal
+  # shellcheck disable=SC2046
+  ${ROOTCMD} dpkg --list $(grep -v '^#' "${target}/${PACKAGE_LIST}" | grep -v -- '-$') 2>"${TMPSTDERR}" | \
+    grep -e '^[urph][ncufhWt]' > "${TMPSTDOUT}" || true
+
+  # extract packages from stdout
+  awk '/^un/ {print $2 " not_installable"}' "${TMPSTDOUT}" >> "${LOGDIR}/package_errors.log"
+
+  # extract packages from stderr
+  grep 'packages found matching' "${TMPSTDERR}" | \
+    sed 's/dpkg-query: [Nn]o packages found matching \(.*\)/\1 not_installable/' >> "${LOGDIR}/package_errors.log"
+
+  rm -f "${TMPSTDOUT}" "${TMPSTDERR}"
+fi
 
-if ! [ -r "$target/${PACKAGE_LIST}" ] ; then
-   echo "No $target/${PACKAGE_LIST} found, will not run package validation check."
+if [ -s "${LOGDIR}/package_errors.log" ] ; then
+  echo "Warning: failed (there have been errors, find them at ${LOGDIR}/package_errors.log)."
 else
-   printf "Validating package list: "
-   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"
-   fi
+  echo "Done - no errors found."
 fi
 
 ## END OF FILE #################################################################