live-systems.org/gitweb
/
live-build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11d97a6
)
Adding default-preseeding for non-free firmware only when non-free is actually includ...
author
Daniel Baumann
<daniel@debian.org>
Thu, 22 Nov 2012 16:11:00 +0000
(17:11 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Thu, 22 Nov 2012 16:11:00 +0000
(17:11 +0100)
scripts/build/chroot_linux-image
patch
|
blob
|
blame
|
history
diff --git
a/scripts/build/chroot_linux-image
b/scripts/build/chroot_linux-image
index
ced4549
..
4996a55
100755
(executable)
--- 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