summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-11-22 17:11:00 +0100
committerDaniel Baumann <daniel@debian.org>2012-11-22 17:11:00 +0100
commit3ca8e64d0f794d4d60183cb23bc5a094209dcc5a (patch)
treef102f586adda79572fdd63993009829dbd14bd9d
parent11d97a6a5f17fe2c500a798aa4a32fa6889e409c (diff)
downloadvyos-live-build-3ca8e64d0f794d4d60183cb23bc5a094209dcc5a.tar.gz
vyos-live-build-3ca8e64d0f794d4d60183cb23bc5a094209dcc5a.zip
Adding default-preseeding for non-free firmware only when non-free is actually included, to avoid cluttering debconf db by default on all systems.
-rwxr-xr-xscripts/build/chroot_linux-image6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index ced454915..4996a553e 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -113,12 +113,16 @@ then
echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') >> chroot/root/packages.chroot
done
-# Some known licenses required to be accepted
+ # Some known licenses required to be accepted
+ if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
+ then
+
cat >> chroot/root/packages.chroot.cfg << EOF
firmware-ivtv firmware-ivtv/license/accepted boolean true
firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
EOF
+ fi
fi
# Creating stage file