X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F95-package-information;h=05b9a330ad9dad65599fb28cf03dc9598616fc26;hb=78b2757daaad5f7878b3ebd7d911cdc7cb9690eb;hp=1d148e3d1aa26380f302675582182e9f176e24a8;hpb=436d892c18acb32cf96f4e4c2cc80e73ea8b7386;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 1d148e3..05b9a33 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -18,9 +18,26 @@ else
    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' > \
+      $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
 
 ## END OF FILE #################################################################