[debian-edu-commits] [Git][debian-edu/debian-edu-install][personal/gber/remove-non-free-contrib] 2 commits: Fix security mirror URL generated by apt-setup generator script (closes #1058788)

[Guido Berhörster (@gber)]

Guido Berhörster pushed to branch personal/gber/remove-non-free-contrib at Debian Edu / debian-edu-install


Commits:
76b7242f by Wolfgang Schweer at 2023-12-22T13:00:59+01:00
Fix security mirror URL generated by apt-setup generator script (closes #1058788)

Since Debian changed the security mirror URL (as of bullseye), the
related Debian Edu apt-setup generator script (70debian-edu-install)
prevents the Debian installer apt-setup mechanism to write the security
mirror entry *also in case of an existing Internet connection*.

The Debian Edu apt-setup generator script is useful in case of
completely offline installations (using the BD ISO image). The manual
informs about the missing security mirror entry in this case, see:
https://wiki.debian.org/DebianEdu/Documentation/Bullseye/Installation#A_note_on_USB_flash_drive_.2F_Blu-ray_disc_image_installs

Fix this by pointing the generator script to the correct URL.

- - - - -
eb7e012a by Wolfgang Schweer at 2023-12-22T12:02:14+00:00
Remove non-free and contrib repository components (closes #1058789)

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).

The non-free and contrib repository components are thus no longer needed for
firmware and as a Debian Pure Blend, Debian Edu should no longer enable them.

- - - - -


2 changed files:

- apt-setup/generators/70debian-edu-install
- preseed-values/defaults.common


Changes:

=====================================
apt-setup/generators/70debian-edu-install
=====================================
@@ -28,7 +28,7 @@ DISTRIBUTION="$RET"
 # Prevent installer to contact security host as we don't have network
 # connection.  Setting apt-setup/security_host to an empty value will
 # make apt-setup/generators/90security skip the security mirror
-if ! wget -qO - http://security.debian.org/dists/$DISTRIBUTION/updates/Release ; then
+if ! wget -qO - http://security.debian.org/dists/$DISTRIBUTION-security/Release ; then
 	log "Disabling security mirror, unable to reach it using http/wget"
 	db_fset apt-setup/security_host seen true || true
 	db_set apt-setup/security_host "" || true


=====================================
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



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/9d0ee323be0858452b634288b9520109ff280b93...eb7e012a526c8d3e53e1575fdfbe4288473736cd

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/9d0ee323be0858452b634288b9520109ff280b93...eb7e012a526c8d3e53e1575fdfbe4288473736cd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20231222/6edd9911/attachment-0001.htm>