diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-26 22:49:57 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-26 22:56:57 +0200 |
| commit | 4a182167c787e167ddc616954d29d01d087e26c6 (patch) | |
| tree | 335babaec555e99cff86d14db5a82f71dba9db3e | |
| parent | 5787c78ff05ca9351935d683118fbda7fdd97278 (diff) | |
| download | vyos-live-build-4a182167c787e167ddc616954d29d01d087e26c6.tar.gz vyos-live-build-4a182167c787e167ddc616954d29d01d087e26c6.zip | |
Automatically preseed some known firmware packages.
| -rwxr-xr-x | scripts/build/lb_chroot_linux-image | 7 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_preseed | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 344dfbbde..ad094c521 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -92,6 +92,13 @@ then do echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') >> chroot/root/packages.chroot done + +# Some known licenses required to be accepted +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 # Creating stage file diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed index f100ade1c..893b0f5ba 100755 --- a/scripts/build/lb_chroot_preseed +++ b/scripts/build/lb_chroot_preseed @@ -39,7 +39,8 @@ Check_lockfile .lock Create_lockfile .lock if ls config/preseed/*.preseed > /dev/null 2>&1 || \ - ls config/preseed/*.preseed.chroot > /dev/null 2>&1 + ls config/preseed/*.preseed.chroot > /dev/null 2>&1 || \ + ls chroot/root/packages.chroot.cfg > /dev/null 2>&1 then # Check dependency Check_package chroot/usr/bin/debconf-set-selections debconf @@ -47,7 +48,7 @@ then # Install dependency Install_package - for PRESEED in config/preseed/*.preseed config/preseed/*.preseed.chroot + for PRESEED in config/preseed/*.preseed config/preseed/*.preseed.chroot chroot/root/packages.chroot.cfg do if [ -e "${PRESEED}" ] then @@ -61,6 +62,8 @@ then fi done + rm -f chroot/root/packages.chroot.cfg + # Remove dependency Remove_package |