From: Michael Prokop <mika@grml.org>
Date: Wed, 3 Jun 2015 13:43:29 +0000 (+0200)
Subject: Install firmware-linux only when non-free is among the COMPONENTS
X-Git-Tag: v0.70~3
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=831a5d8c6003efcfa5eabaa181a026b795ac68e1

Install firmware-linux only when non-free is among the COMPONENTS

Closes: #786966
Thanks: Philip Hands <phil@hands.com> for the patch
---

diff --git a/chroot-script b/chroot-script
index e189e47..b283991 100755
--- a/chroot-script
+++ b/chroot-script
@@ -351,7 +351,11 @@ kernel() {
   KVER=$(get_kernel_version)
   if [ -n "$KVER" ] ; then
      # note: install busybox to be able to debug initramfs
-     KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free firmware-linux"
+     KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free"
+     # only add firmware-linux if we have non-free as a component
+     if expr "$COMPONENTS" : '.*non-free' >/dev/null ; then
+       KERNELPACKAGES="$KERNELPACKAGES firmware-linux"
+     fi
      DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
   else
      echo "Warning: Could not find a kernel for your system. Your system won't be able to boot itself!"