Bug#1058789: defaults.common: don't add contrib and non-free mirror components

Wolfgang Schweer <[email protected]>
Newsgroups gmane.linux.skolelinux.devel
Message-ID <ZX19qyT-VE_viD5Y__20151.2057728664$1702723179$gmane$org@star.localdomain>
Source: debian-edu-install
Version: 2.12.9~deb12u1
Severity: normal
Tags: patch

Dear Maintainer,

since the Debian bookworm release, d-i apt-setup adds non-free-firmware 
as new default mirror component by default. This improves user 
experience in case of awkward hardware (esp. network components).

As a Debian Pure Blend, Debian Edu should no longer enable contrib and 
non-free mirror components.

Those have been a service for users when d-e-config/.../tools/pxe-addfirmware
and .../tools/ltsp-addfirmware were needed to add required non-free firmware.

Please note: Both scripts might be obsolete as of bookworm. Also, the 
manual might need revision concerning non-free firmware.

This change will fix the bug (patch also attached):

diff --git a/preseed-values/defaults.common b/preseed-values/defaults.common
index cd4d08ca..9bb71e35 100644
--- a/preseed-values/defaults.common
+++ b/preseed-values/defaults.common
@@ -41,5 +41,3 @@ hddtemp hddtemp/daemon boolean false
 # remove the need to set up APT sources using cfengine.
 choose-mirror-bin mirror/http/hostname string deb.debian.org
 choose-mirror-bin mirror/http/directory string /debian/
-apt-mirror-setup apt-setup/non-free boolean true
-apt-mirror-setup apt-setup/contrib boolean true

Wolfgang
unfree.patch (text/x-diff, 513 B)
diff --git a/preseed-values/defaults.common b/preseed-values/defaults.common
index cd4d08ca..9bb71e35 100644
--- a/preseed-values/defaults.common
+++ b/preseed-values/defaults.common
@@ -41,5 +41,3 @@ hddtemp hddtemp/daemon boolean false
 # remove the need to set up APT sources using cfengine.
 choose-mirror-bin mirror/http/hostname string deb.debian.org
 choose-mirror-bin mirror/http/directory string /debian/
-apt-mirror-setup apt-setup/non-free boolean true
-apt-mirror-setup apt-setup/contrib boolean true
signature.asc (application/pgp-signature, 963 B)
-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEUtFpn8Xin4U91tKIF+yw1/QxG0wFAmV9fapfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDUy
RDE2OTlGQzVFMjlGODUzREQ2RDI4ODE3RUNCMEQ3RjQzMTFCNEMACgkQF+yw1/Qx
G0ylFRAAh1utgb1vlNuo7XCCoCQrZptrV1hi+zNIWqWBQ6BetK36I3o6MbTpxc49
I/yMClhahcNfHtkIRvn/VJF7wjLhC8VnZIoIuYitLrO4AEU8tCKpXYIi6LrF8CYa
tS9uuFpUuIc+uTvQQ7WhatoSm26fnwn8iy3xk0zE28HzvLVY6x5m1blQT4qal7Ls
TRWAakS/h5lK1oiayXcP7k0H+h12BM+vRcbKXl80LwyFY4yqVyCGxqqTfAYqb8yU
gZT9J0B6ygTKAezICnTsGHc7HYNke7feLE+cdFpmMSIDd+PHa7WtCplkplOpIJ2O
+U3m4qCp0rSvIeCWtsrD9gfbsMMIBZaTrQ/CU3ge7L4CZtttdnJnTu4jjexnUwSN
vKpruLBthe5+ET4e5mlTM8EpSjTDsKWllnJHHFqpoc44I9t3rT4+yO336K14o/bL
rlU58HMaRCp1nnDZTlyHaATrNRTvXsS1EnS/OyVZnZXpR3FVT4cu1ieT+Vly3UAh
LLSAvHslJeSTM2Q+zZIJox0TyVnS2Rpl9271QWQa4eD+kx/XgDUGM7a6/wvDO578
0bHx0aX5K44TPqHCLc2YpGWAdXuInlMBCI978nsdIPMNMtL0xLaHetux/CBUyqIG
+pFyQtCd8X0Zpc6/C66BloQKzr86jjxGoEiY+XIojS2qwAT6wro=
=0AJ5
-----END PGP SIGNATURE-----
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.