X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F95-package-information;h=700abf7ac3cc7e31affec3d2895542d88b0eb4c6;hb=fba0f4eb8122a535ae1c54ebb3d0752f4682bec5;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..700abf7 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information +++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information @@ -11,14 +11,10 @@ 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 "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG" [ -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 exit 1