X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F95-package-information;h=f9495fef1a47ac9e17647908e09ad060befeecb1;hp=2cce18ecca816a6b5ff24b5576628f26cec299a4;hb=bfe1fbd4df16c2c92cbed7e19cb52b2d533bf61a;hpb=9a408a8ff28183b77116cdd73e368834eabdb5ae

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index 2cce18e..f9495fe 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -1,22 +1,33 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/95-package-information
 # Purpose:       store package information of chroot system
 # 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: Sat Oct 13 17:48:38 CEST 2007 [mika]
 ################################################################################
 
+set -u
+set -e
+
 HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
+PACKAGE_LOG=/var/log/fai/"$HOSTNAME"/last/
 
-if [ -x $target/usr/bin/dpkg-query ] ; then
-   $ROOTCMD dpkg-query -W --showformat='${Package}\t${Installed-Size;10}\n' > \
-   /var/log/fai/dirinstall/$HOSTNAME/packages.size
+if ! [ -w "$PACKAGE_LOG" ] ; then
+   echo "Error: can not write to ${PACKAGE_LOG}. Exiting.">&2
+   exit 1
+else
+   # store package list for the build process logs as well:
+   COLUMNS=200 $ROOTCMD dpkg --list > "${PACKAGE_LOG}"/dpkg.list
+   COLUMNS=200 $ROOTCMD dpkg --get-selections > "${PACKAGE_LOG}"/dpkg.selections
+   # store list of packages sorted by size:
+   if [ -x $target/usr/bin/dpkg-query ] ; then
+      $ROOTCMD dpkg-query -W --showformat='${Package}\t${Installed-Size;10}\n' > \
+      "${PACKAGE_LOG}"/packages.size
+   fi
 fi
 
-COLUMNS=200 $ROOTCMD dpkg --list > /var/log/fai/dirinstall/$HOSTNAME/dpkg.list
-COLUMNS=200 $ROOTCMD dpkg --get-selections > /var/log/fai/dirinstall/$HOSTNAME/dpkg.selections
-
 ## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2