aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-09-06 11:46:00 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-09-06 13:59:05 +0200
commit8a51fbd1af233b282c6a3889fe0dae64b5cde986 (patch)
tree04c21bae98fe2c4ebfffd8bb42b7485ebecab200
parent17825b30035094ec57cf069717ecfb25188de881 (diff)
downloaddebian-edu-fai+itzks-8a51fbd1af233b282c6a3889fe0dae64b5cde986.tar.gz
debian-edu-fai+itzks-8a51fbd1af233b282c6a3889fe0dae64b5cde986.tar.bz2
debian-edu-fai+itzks-8a51fbd1af233b282c6a3889fe0dae64b5cde986.zip
Debian 11 is stable now, get ready for Debian 12.
-rw-r--r--fai/config/class/DEBIAN_12.var1
-rw-r--r--fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_129
-rw-r--r--fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_129
-rw-r--r--fai/config/files/etc/apt/sources.list/DEBIAN_125
-rw-r--r--fai/config/files/etc/motd/DEBIAN_112
-rw-r--r--fai/config/files/etc/motd/DEBIAN_123
6 files changed, 28 insertions, 1 deletions
diff --git a/fai/config/class/DEBIAN_12.var b/fai/config/class/DEBIAN_12.var
new file mode 100644
index 0000000..9cd498d
--- /dev/null
+++ b/fai/config/class/DEBIAN_12.var
@@ -0,0 +1 @@
+release=bookworm
diff --git a/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_12 b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_12
new file mode 100644
index 0000000..d995bf0
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_12
@@ -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_12 b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_12
new file mode 100644
index 0000000..a88c542
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_12
@@ -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_12 b/fai/config/files/etc/apt/sources.list/DEBIAN_12
new file mode 100644
index 0000000..0fdc4dd
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list/DEBIAN_12
@@ -0,0 +1,5 @@
+deb http://deb.debian.org/debian {%release%} main
+deb http://deb.debian.org/debian {%release%}-updates main
+
+# different from the URL required for Debian 10
+deb {%security_cdn%}/debian-security {%release%}-security main
diff --git a/fai/config/files/etc/motd/DEBIAN_11 b/fai/config/files/etc/motd/DEBIAN_11
index c0afe61..273cb59 100644
--- a/fai/config/files/etc/motd/DEBIAN_11
+++ b/fai/config/files/etc/motd/DEBIAN_11
@@ -1,3 +1,3 @@
-Debian Edu 11.x (testing/unstable) installed with FAI...
+Debian Edu 11.x installed with FAI...
diff --git a/fai/config/files/etc/motd/DEBIAN_12 b/fai/config/files/etc/motd/DEBIAN_12
new file mode 100644
index 0000000..c8fc8ba
--- /dev/null
+++ b/fai/config/files/etc/motd/DEBIAN_12
@@ -0,0 +1,3 @@
+
+Debian Edu 12.x (testing/unstable) installed with FAI...
+