X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F95-package-information;h=1d148e3d1aa26380f302675582182e9f176e24a8;hb=7477e438623f7581965a95d82cba282e38fdeb6e;hp=f1196de63c3f104dc6eb7814cf711d526f913ade;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index f1196de..1d148e3 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -9,27 +9,17 @@
 set -u
 set -e
 
-HOSTNAME=''
-[ -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/
-
-# generate the package list and store it on the ISO itself for grml-docs:
-[ -d $target/usr/share/doc/grml-docs/packages ] || mkdir -p $target/usr/share/doc/grml-docs/packages
-COLUMNS=200 $ROOTCMD dpkg --list > $target/usr/share/doc/grml-docs/packages/dpkg_list
-
-if ! [ -w "$PACKAGE_LOG" ] ; then
-   echo "Error: can not write to ${PACKAGE_LOG}. Exiting.">&2
+if ! [ -w "$LOGDIR" ] ; then
+   echo "Error: can not write to ${LOGDIR}. 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
+   COLUMNS=200 $ROOTCMD dpkg --list > "${LOGDIR}"/dpkg.list
+   COLUMNS=200 $ROOTCMD dpkg --get-selections > "${LOGDIR}"/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
+      "${LOGDIR}"/packages.size
    fi
 fi