X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F95-package-information;h=05b9a330ad9dad65599fb28cf03dc9598616fc26;hp=700abf7ac3cc7e31affec3d2895542d88b0eb4c6;hb=b6bb1f8777396f98a6ddb0ef05057eb39bdd3512;hpb=9dafaad2fe959f195d68a38655f60d00ee028256

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index 700abf7..05b9a33 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -9,23 +9,34 @@
 set -u
 set -e
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
-PACKAGE_LOG=/var/log/fai/"$HOSTNAME"/last/
-
-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
+      $ROOTCMD dpkg-query -W --showformat='${Package}\t${Installed-Size}\n' > \
+      "${LOGDIR}"/packages.size
+   fi
+   # store a list of non-free packages and their licenses
+   if $ROOTCMD test -x /usr/bin/aptitude ; then
+      echo "The following packages from the Debian non-free section are included in this release" \
+         > "${LOGDIR}"/nonfree-licenses.txt
+      echo >> "${LOGDIR}"/nonfree-licenses.txt
+      for pkg in `$ROOTCMD aptitude search '~i ~snon-free' -F '%p'` ; do
+         echo "Package: ${pkg}" >> "${LOGDIR}"/nonfree-licenses.txt
+         echo "========================================================================" \
+            >> "${LOGDIR}"/nonfree-licenses.txt
+         if $ROOTCMD test -r "/usr/share/doc/${pkg}/copyright" ; then
+            $ROOTCMD cat "/usr/share/doc/${pkg}/copyright" >> "${LOGDIR}"/nonfree-licenses.txt
+         else
+            echo "${pkg} does not provide a copyright file" >> "${LOGDIR}"/nonfree-licenses.txt
+         fi
+         echo >> "${LOGDIR}"/nonfree-licenses.txt
+      done
    fi
 fi