diff options
| -rwxr-xr-x | bin/debian-edu-faiinstall | 5 | ||||
| -rw-r--r-- | conf/debian-edu/fai/debian-edu-fai.TEMPLATE/apt/sources.list.in | 8 | ||||
| -rw-r--r-- | fai/config/files/etc/apt/sources.list/DEBIAN_12 | 6 |
3 files changed, 12 insertions, 7 deletions
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} diff --git a/conf/debian-edu/fai/debian-edu-fai.TEMPLATE/apt/sources.list.in b/conf/debian-edu/fai/debian-edu-fai.TEMPLATE/apt/sources.list.in index 0c68ac2..8c8f493 100644 --- a/conf/debian-edu/fai/debian-edu-fai.TEMPLATE/apt/sources.list.in +++ b/conf/debian-edu/fai/debian-edu-fai.TEMPLATE/apt/sources.list.in @@ -1,11 +1,11 @@ # These lines should work for many sites -deb @mirrorurl@ @codename@ main contrib non-free -deb @mirrorurl@-security @codename@-security main contrib non-free -#deb @mirrorurl@ @codename@-backports main contrib non-free +deb @mirrorurl@ @codename@ main non-free-firmware contrib non-free +deb @mirrorurl@-security @codename@-security main non-free-firmware contrib non-free +#deb @mirrorurl@ @codename@-backports main non-free-firmware contrib non-free # from @codename@ on you need -#deb @mirrorurl@-security @codename@-security main contrib non-free +#deb @mirrorurl@-security @codename@-security main non-free-firmware contrib non-free # repository that may contain newer fai packages for @codename@ #deb http://fai-project.org/download @codename@ koeln diff --git a/fai/config/files/etc/apt/sources.list/DEBIAN_12 b/fai/config/files/etc/apt/sources.list/DEBIAN_12 index 0fdc4dd..2d9e644 100644 --- a/fai/config/files/etc/apt/sources.list/DEBIAN_12 +++ b/fai/config/files/etc/apt/sources.list/DEBIAN_12 @@ -1,5 +1,5 @@ -deb http://deb.debian.org/debian {%release%} main -deb http://deb.debian.org/debian {%release%}-updates main +deb http://deb.debian.org/debian {%release%} main non-free-firmware +deb http://deb.debian.org/debian {%release%}-updates main non-free-firmware # different from the URL required for Debian 10 -deb {%security_cdn%}/debian-security {%release%}-security main +deb {%security_cdn%}/debian-security {%release%}-security main non-free-firmware |