diff options
7 files changed, 27 insertions, 27 deletions
diff --git a/fai/config/class/debian-edu.profile b/fai/config/class/debian-edu.profile index c79435a..fe73f86 100644 --- a/fai/config/class/debian-edu.profile +++ b/fai/config/class/debian-edu.profile @@ -6,43 +6,43 @@ Short: Installs a Debian Edu client system, text console only Long: Installs a Debian Edu client system, text console only. Use this installation profile for server-like systems that do not need a graphical login. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU LVM LVM_EDU NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU LVM LVM_EDU NONFREE NONFREE_11 Name: Edu+EFI-Workstation/MATE Description: Debian Edu workstation, powered by Mate Desktop Short: Debian Edu workstation with Mate desktop will be installed Long: Debian Edu workstation with Mate desktop will be installed. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU WORKSTATION XORG MATE LVM LVM_EDU NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU WORKSTATION XORG MATE LVM LVM_EDU NONFREE NONFREE_11 Name: Edu+Roaming-EFI-Workstation/MATE Description: Debian Edu roaming workstation, powered by Mate Desktop Short: Debian Edu roaming workstation with Mate desktop will be installed Long: Debian Edu roaming workstation with Mate desktop will be installed. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU ROAMING_WORKSTATION XORG MATE LVM LVM_EDU_ROAMING NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU ROAMING_WORKSTATION XORG MATE LVM LVM_EDU_ROAMING NONFREE NONFREE_11 Name: Edu+BIOS-Workstation/MATE Description: Debian Edu workstation, powered by Mate Desktop Short: Debian Edu workstation with Mate desktop will be installed Long: Debian Edu workstation with Mate desktop will be installed. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU WORKSTATION XORG MATE LVM LVM_EDU_LEGACY NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU WORKSTATION XORG MATE LVM LVM_EDU_LEGACY NONFREE NONFREE_11 Name: Edu+Roaming-BIOS-Workstation/MATE Description: Debian Edu roaming workstation, powered by Mate Desktop Short: Debian Edu roaming workstation with Mate desktop will be installed Long: Debian Edu roaming workstation with Mate desktop will be installed. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU ROAMING_WORKSTATION XORG MATE LVM LVM_EDU_ROAMING_LEGACY NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU ROAMING_WORKSTATION XORG MATE LVM LVM_EDU_ROAMING_LEGACY NONFREE NONFREE_11 Name: Edu+Workstation/GNOME Description: Debian Edu workstation, powered by Gnome Desktop Short: Debian Edu workstation with Gnome desktop will be installed Long: Debian Edu workstation with Gnome desktop will be installed. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU WORKSTATION XORG GNOME LVM LVM_EDU NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU WORKSTATION XORG GNOME LVM LVM_EDU NONFREE NONFREE_11 Name: Edu+Roaming-Workstation/GNOME Description: Debian Edu roaming workstation, powered by Gnome Desktop Short: Debian Edu roaming workstation with Gnome desktop will be installed Long: Debian Edu roaming workstation with Gnome desktop will be installed. -Classes: INSTALL FAIBASE DEBIAN DEBIAN_10 EDU ROAMING_WORKSTATION XORG GNOME LVM LVM_EDU_ROAMING NONFREE +Classes: INSTALL FAIBASE DEBIAN DEBIAN_11 EDU ROAMING_WORKSTATION XORG GNOME LVM LVM_EDU_ROAMING NONFREE NONFREE_11 Name: Inventory Description: Show hardware info diff --git a/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE deleted file mode 100644 index 87ec531..0000000 --- a/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE +++ /dev/null @@ -1,7 +0,0 @@ -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%}/updates 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-contrib.list/NONFREE_10 b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_10 new file mode 100644 index 0000000..7f5494a --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_10 @@ -0,0 +1,7 @@ +#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%}/updates 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-contrib.list/NONFREE_11 b/fai/config/files/etc/apt/sources.list.d/debian-contrib.list/NONFREE_11 index 475fa9a..d947506 100644 --- 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 @@ -3,7 +3,7 @@ deb [trusted=yes arch=amd64] http://faiserver.intern/mirror-deb11-gnome cskoeln #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 {%security_cdn%}/debian-security {%release%}-security contrib -#deb {%apt_cdn%}/debian {%release%} contrib -#deb {%apt_cdn%}/debian {%release%}-updates 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 b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE deleted file mode 100644 index c476baf..0000000 --- a/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE +++ /dev/null @@ -1,7 +0,0 @@ -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%}/updates 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.d/debian-nonfree.list/NONFREE_10 b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_10 new file mode 100644 index 0000000..4c72544 --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_10 @@ -0,0 +1,7 @@ +#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%}/updates 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.d/debian-nonfree.list/NONFREE_11 b/fai/config/files/etc/apt/sources.list.d/debian-nonfree.list/NONFREE_11 index c2f274b..fc0e0af 100644 --- 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 @@ -3,7 +3,7 @@ deb [trusted=yes arch=amd64] http://faiserver.intern/mirror-deb11-gnome cskoeln #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 {%security_cdn%}/debian-security {%release%}-security non-free -#deb {%apt_cdn%}/debian {%release%} non-free -#deb {%apt_cdn%}/debian {%release%}-updates non-free +deb {%apt_cdn%}/debian {%release%} non-free +deb {%apt_cdn%}/debian {%release%}-updates non-free |