Add non-free back in, preseed installation for a couple firmwares

CBPP · May 13, 2023 · c79a109 · c79a109
1 parent 6a3e095
commit c79a109
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/amd64/config/bootstrap b/amd64/config/bootstrap
@@ -25,10 +25,10 @@ LB_PARENT_DISTRIBUTION_BINARY="bookworm"
 LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
 
 # Select archive areas to use
-LB_ARCHIVE_AREAS="main contrib non-free-firmware"
+LB_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
 
 # Select parent archive areas to use
-LB_PARENT_ARCHIVE_AREAS="main contrib non-free-firmware"
+LB_PARENT_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
 
 # Set parent mirror to bootstrap from
 LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"

diff --git a/amd64/config/build b/amd64/config/build
@@ -1,6 +1,6 @@
 [Image]
 Architecture: amd64
-Archive-Areas: main contrib non-free-firmware
+Archive-Areas: main contrib non-free non-free-firmware
 Distribution: bookworm
 Mirror-Bootstrap: http://deb.debian.org/debian/
 

diff --git a/amd64/config/hooks/live/0500-lxdm.hook.chroot b/amd64/config/hooks/live/0500-lxdm.hook.chroot
@@ -10,10 +10,6 @@ set -e
 
 apt-get -y install --no-install-recommends lxdm
 
-# crappy hacks for bullseye non-interactive prompt
-echo yes | apt-get -y install firmware-ivtv
-echo yes | apt-get -y install firmware-ipw2x00
-
 apt-get -y install cbpp-metapackage
 
 update-alternatives --set x-session-manager /usr/bin/openbox-session
diff --git a/amd64/config/hooks/normal/0500-lxdm.hook.chroot b/amd64/config/hooks/normal/0500-lxdm.hook.chroot
@@ -10,12 +10,6 @@ set -e
 
 apt-get -y install --no-install-recommends lxdm
 
-# crappy hacks for bullseye non-interactive prompt
-# echo -e "2\n1\n" | dpkg-reconfigure debconf
-# echo yes | apt-get -y install firmware-ivtv
-# echo yes | apt-get -y install firmware-ipw2x00
-# echo -e "6\n1\n" | dpkg-reconfigure debconf
-
 apt-get -y install cbpp-metapackage
 
 update-alternatives --set x-session-manager /usr/bin/openbox-session
diff --git a/amd64/config/preseed/preseed.cfg.binary b/amd64/config/preseed/preseed.cfg.binary
@@ -0,0 +1,2 @@
+firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
+firmware-ivtv firmware-ivtv/license/accepted boolean true
diff --git a/amd64/config/preseed/preseed.cfg.chroot b/amd64/config/preseed/preseed.cfg.chroot
@@ -0,0 +1,2 @@
+firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
+firmware-ivtv firmware-ivtv/license/accepted boolean true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
		firmware-ivtv firmware-ivtv/license/accepted boolean true