diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-07-08 15:58:14 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-07-08 16:16:31 +0200 |
commit | 71ba935e5f0318e09a401dfcadeebc7130998096 (patch) | |
tree | 2431533208b506ecb8360ee34627b21306824dd2 | |
parent | fc718fac8e1fee5731727c50b5b4d1accc79021c (diff) | |
download | debian-edu-fai+itzks-71ba935e5f0318e09a401dfcadeebc7130998096.tar.gz debian-edu-fai+itzks-71ba935e5f0318e09a401dfcadeebc7130998096.tar.bz2 debian-edu-fai+itzks-71ba935e5f0318e09a401dfcadeebc7130998096.zip |
Add support for Debian 11 (aka bullseye).
-rwxr-xr-x | fai/config/basefiles/mk-basefile | 3 | ||||
-rw-r--r-- | fai/config/class/DEBIAN.var | 1 | ||||
-rw-r--r-- | fai/config/class/DEBIAN_10.var | 1 | ||||
-rw-r--r-- | fai/config/class/DEBIAN_11.var | 1 | ||||
-rw-r--r-- | fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_11 | 9 | ||||
-rw-r--r-- | fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_11 | 9 | ||||
-rw-r--r-- | fai/config/files/etc/apt/sources.list/DEBIAN_10 (renamed from fai/config/files/etc/apt/sources.list/DEBIAN) | 1 | ||||
-rw-r--r-- | fai/config/files/etc/apt/sources.list/DEBIAN_11 | 8 | ||||
-rw-r--r-- | fai/config/files/etc/motd/DEBIAN_10 (renamed from fai/config/files/etc/motd/FAIBASE) | 0 | ||||
-rw-r--r-- | fai/config/files/etc/motd/DEBIAN_11 | 3 |
10 files changed, 34 insertions, 2 deletions
diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile index deb12d4..b4151ae 100755 --- a/fai/config/basefiles/mk-basefile +++ b/fai/config/basefiles/mk-basefile @@ -29,6 +29,7 @@ EXCLUDE_WHEEZY=info EXCLUDE_JESSIE=info EXCLUDE_STRETCH=info EXCLUDE_BUSTER= +EXCLUDE_BULLSEYE= EXCLUDE_SID= EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info @@ -290,7 +291,7 @@ case "$target" in SLC7_64) slc amd64 7 ;; TRUSTY*|XENIAL*|BIONIC*) debgeneric $target $MIRROR_UBUNTU ;; - SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|SID*) + SQUEEZE*|WHEEZY*|JESSIE*|STRETCH*|BUSTER*|BULLSEYE*|SID*) debgeneric $target $MIRROR_DEBIAN $ARCH;; *) echo "Unknown distribution. Aborting." prtdists diff --git a/fai/config/class/DEBIAN.var b/fai/config/class/DEBIAN.var index 3b0d7b4..c5be6c7 100644 --- a/fai/config/class/DEBIAN.var +++ b/fai/config/class/DEBIAN.var @@ -1,4 +1,3 @@ -release=buster apt_cdn=http://deb.debian.org security_cdn=http://security.debian.org diff --git a/fai/config/class/DEBIAN_10.var b/fai/config/class/DEBIAN_10.var new file mode 100644 index 0000000..4538d96 --- /dev/null +++ b/fai/config/class/DEBIAN_10.var @@ -0,0 +1 @@ +release=buster diff --git a/fai/config/class/DEBIAN_11.var b/fai/config/class/DEBIAN_11.var new file mode 100644 index 0000000..41e5efa --- /dev/null +++ b/fai/config/class/DEBIAN_11.var @@ -0,0 +1 @@ +release=bullseye diff --git a/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_11 b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_11 new file mode 100644 index 0000000..475fa9a --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_11 @@ -0,0 +1,9 @@ +deb [trusted=yes arch=amd64] http://faiserver.intern/mirror-deb11-gnome cskoeln contrib + +#deb http://ftp.de.debian.org/debian {%release%} contrib +#deb http://ftp.de.debian.org/debian {%release%}-updates contrib + +#deb {%security_cdn%}/debian-security {%release%}-security contrib + +#deb {%apt_cdn%}/debian {%release%} contrib +#deb {%apt_cdn%}/debian {%release%}-updates contrib diff --git a/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_11 b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_11 new file mode 100644 index 0000000..c2f274b --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_11 @@ -0,0 +1,9 @@ +deb [trusted=yes arch=amd64] http://faiserver.intern/mirror-deb11-gnome cskoeln non-free + +#deb http://ftp.de.debian.org/debian {%release%} non-free +#deb http://ftp.de.debian.org/debian {%release%}-updates non-free + +#deb {%security_cdn%}/debian-security {%release%}-security non-free + +#deb {%apt_cdn%}/debian {%release%} non-free +#deb {%apt_cdn%}/debian {%release%}-updates non-free diff --git a/fai/config/files/etc/apt/sources.list/DEBIAN b/fai/config/files/etc/apt/sources.list/DEBIAN_10 index 1352ebc..85ff074 100644 --- a/fai/config/files/etc/apt/sources.list/DEBIAN +++ b/fai/config/files/etc/apt/sources.list/DEBIAN_10 @@ -1,6 +1,7 @@ deb http://ftp.de.debian.org/debian {%release%} main deb http://ftp.de.debian.org/debian {%release%}-updates main +# this URL will change in Debian 11... deb {%security_cdn%}/debian-security {%release%}/updates main #deb {%apt_cdn%}/debian {%release%} main diff --git a/fai/config/files/etc/apt/sources.list/DEBIAN_11 b/fai/config/files/etc/apt/sources.list/DEBIAN_11 new file mode 100644 index 0000000..8d2e716 --- /dev/null +++ b/fai/config/files/etc/apt/sources.list/DEBIAN_11 @@ -0,0 +1,8 @@ +#deb http://ftp.de.debian.org/debian {%release%} main +#deb http://ftp.de.debian.org/debian {%release%}-updates main + +# different from the URL required for Debian 10 +#deb {%security_cdn%}/debian-security {%release%}-security main + +#deb {%apt_cdn%}/debian {%release%} main +#deb {%apt_cdn%}/debian {%release%}-updates main diff --git a/fai/config/files/etc/motd/FAIBASE b/fai/config/files/etc/motd/DEBIAN_10 index 3584c2f..3584c2f 100644 --- a/fai/config/files/etc/motd/FAIBASE +++ b/fai/config/files/etc/motd/DEBIAN_10 diff --git a/fai/config/files/etc/motd/DEBIAN_11 b/fai/config/files/etc/motd/DEBIAN_11 new file mode 100644 index 0000000..c0afe61 --- /dev/null +++ b/fai/config/files/etc/motd/DEBIAN_11 @@ -0,0 +1,3 @@ + +Debian Edu 11.x (testing/unstable) installed with FAI... + |