diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-09-17 23:36:25 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-09-14 08:04:55 +0200 |
| commit | fb9b1ba946e226fdec924ab368cdea2e278dbb23 (patch) | |
| tree | 1a48ffbaadf4b8edfdaef72106fbd7fe9a009878 | |
| parent | 59f82a75f947a86502003fae3dd01bfef287f353 (diff) | |
| download | debian-edu-fai+itzks-fb9b1ba946e226fdec924ab368cdea2e278dbb23.tar.gz debian-edu-fai+itzks-fb9b1ba946e226fdec924ab368cdea2e278dbb23.tar.bz2 debian-edu-fai+itzks-fb9b1ba946e226fdec924ab368cdea2e278dbb23.zip | |
{bin/debian-edu-fai_install,fai/config/class/DEBIAN.var.in}: Propagate mirrorurl from debian-edu-fai.conf into FAI config space.
| -rwxr-xr-x | bin/debian-edu-fai_install | 1 | ||||
| -rw-r--r-- | fai/config/class/DEBIAN.var.in (renamed from fai/config/class/DEBIAN.var) | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/debian-edu-fai_install b/bin/debian-edu-fai_install index fce3bf8..c34264a 100755 --- a/bin/debian-edu-fai_install +++ b/bin/debian-edu-fai_install @@ -248,6 +248,7 @@ 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}" [ "$school_tag" ] && export school_tag && perl -p -e "s/\@school_tag\@/\$ENV{school_tag}/g" "${file_to_adapt%.in}" > "${file_to_adapt%.in}.new" && mv "${file_to_adapt%.in}.new" "${file_to_adapt%.in}" + [ "$mirrorurl" ] && export mirrorurl && perl -p -e "s/\@mirrorurl\@/\$ENV{mirrorurl}/g" "${file_to_adapt%.in}" > "${file_to_adapt%.in}.new" && mv "${file_to_adapt%.in}.new" "${file_to_adapt%.in}" chown root:root ${file_to_adapt} chmod 0600 ${file_to_adapt} diff --git a/fai/config/class/DEBIAN.var b/fai/config/class/DEBIAN.var.in index 28c3402..7c5bb76 100644 --- a/fai/config/class/DEBIAN.var +++ b/fai/config/class/DEBIAN.var.in @@ -1,4 +1,4 @@ -apt_cdn=http://deb.debian.org +apt_cdn=$(echo '@mirrorurl@' | sed -E -e 's@(.*://[^/])(/.*)@\1@g') security_cdn=http://security.debian.org CONSOLEFONT= |