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=1cd03edc9d6805852fd35e8906073b11912da4df;hp=902bc0709a091a1ca5256848e72eefd096e15ee7;hb=2def18e419f1474c3904672ce297babbb4b9b501;hpb=f8d2fa05f607bf4440317c21ea0858d78b26891d

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index 902bc07..1cd03ed 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -4,19 +4,30 @@
 # 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]
 ################################################################################
 
 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
-fi
+# generate the package list and store it on the ISO itself for grml-docs:
+[ -d $target/usr/share/doc/grml-docs/packages ] || mkdir $target/usr/share/doc/grml-docs/packages
+COLUMNS=200 $ROOTCMD dpkg --list > $target/usr/share/doc/grml-docs/packages/dpkg_list
 
-$ROOTCMD COLUMNS=200 dpkg --list > /var/log/fai/dirinstall/$HOSTNAME/dpkg.list
-$ROOTCMD COLUMNS=200 dpkg --get-selections > /var/log/fai/dirinstall/$HOSTNAME/dpkg.selections
+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
 
 ## END OF FILE #################################################################