From 9f8a332a4e1f909d1ae62f40afbc6c50e4f084de Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 23 Aug 2023 09:07:56 +0200 Subject: Use non-free-firmware component on bookworm and later This is required for installing the firmware packages. --- bin/debian-edu-faiinstall | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/debian-edu-faiinstall b/bin/debian-edu-faiinstall index 7eb38d4..16eb298 100755 --- a/bin/debian-edu-faiinstall +++ b/bin/debian-edu-faiinstall @@ -160,6 +160,11 @@ for codename in ${codenames}; do [ "$fai_logserver" ] && export fai_logserver && perl -p -e "s/^(#|)LOGSERVER=.{0,1}\@fai_logserver\@.{0,1}\s*\$/LOGSERVER=\'\$ENV{fai_logserver}\'\n/g" "${file_to_adapt%.in}" > "${file_to_adapt%.in}.new" && mv "${file_to_adapt%.in}.new" "${file_to_adapt%.in}" [ "$fai_loguser" ] && export fai_loguser && perl -p -e "s/^(#|)LOGUSER=.{0,1}\@fai_loguser\@.{0,1}\s*\$/LOGUSER=\'\$ENV{fai_loguser}\'\n/g" "${file_to_adapt%.in}" > "${file_to_adapt%.in}.new" && mv "${file_to_adapt%.in}.new" "${file_to_adapt%.in}" + # hack for non-free-firmware repo area added since Debian 12 (aka bookworm) [we only support Debian 11 (aka bullseye) and upwards] + if [ "$codename" = "bullseye" ]; then + perl -p -e "s/ non-free-firmware//g" "${file_to_adapt%.in}" > "${file_to_adapt%.in}.new" && mv "${file_to_adapt%.in}.new" "${file_to_adapt%.in}" + fi + chown root:root ${file_to_adapt%.in} chmod 0600 ${file_to_adapt%.in} rm ${file_to_adapt} -- cgit v1.2.3