Support new non-free-firmware component

Packages like 'firmware-linux', 'firmware-linux-nonfree',
'firmware-misc-nonfree' and further 'firmware-*' got moved from non-free
to the new non-free-firmware component/repository (related to
https://www.debian.org/vote/2022/vote_003).

Closes: https://github.com/grml/grml-live/issues/127

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BOOKWORM b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BOOKWORM
index af01786..6d48e20 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BOOKWORM
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BOOKWORM
@@ -1,7 +1,7 @@
 # official debian repository:
-  deb     http://ftp.debian.org/debian/ bookworm main contrib non-free
-  deb-src http://ftp.debian.org/debian/ bookworm main contrib non-free
+  deb     http://ftp.debian.org/debian/ bookworm main contrib non-free-firmware non-free
+  deb-src http://ftp.debian.org/debian/ bookworm main contrib non-free-firmware non-free
 
 # security updates:
-  deb     http://security.debian.org/debian-security bookworm-security main contrib non-free
-  deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free
+  deb     http://security.debian.org/debian-security bookworm-security main contrib non-free-firmware non-free
+  deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free-firmware non-free

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
index b20afb0..2732475 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
@@ -1,3 +1,3 @@
 # official debian repository:
-  deb     http://ftp.debian.org/debian/ sid main contrib non-free
-  deb-src http://ftp.debian.org/debian/ sid main contrib non-free
+  deb     http://ftp.debian.org/debian/ sid main contrib non-free-firmware non-free
+  deb-src http://ftp.debian.org/debian/ sid main contrib non-free-firmware non-free

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
index a7dbe01..9b6ef42 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
@@ -1,7 +1,7 @@
 # official debian repository:
-  deb     http://ftp.debian.org/debian/ testing main contrib non-free
-  deb-src http://ftp.debian.org/debian/ testing main contrib non-free
+  deb     http://ftp.debian.org/debian/ testing main contrib non-free-firmware non-free
+  deb-src http://ftp.debian.org/debian/ testing main contrib non-free-firmware non-free
 
 # security updates:
-  deb     http://security.debian.org/ testing-security main contrib
-  deb-src http://security.debian.org/ testing-security main contrib
+  deb     http://security.debian.org/ testing-security main contrib non-free-firmware non-free
+  deb-src http://security.debian.org/ testing-security main contrib non-free-firmware non-free

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
index 1491bcb..f280307 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
@@ -1,3 +1,3 @@
 # official debian repository:
-  deb     http://ftp.debian.org/debian/ unstable main contrib non-free
-  deb-src http://ftp.debian.org/debian/ unstable main contrib non-free
+  deb     http://ftp.debian.org/debian/ unstable main contrib non-free-firmware non-free
+  deb-src http://ftp.debian.org/debian/ unstable main contrib non-free-firmware non-free

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 1f9e3ba..2c52205 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -74,7 +74,7 @@
 # ... and then set up an according class file in
 # ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/
 # containing something like:
-# deb file:///media/mirror/debian sid main contrib non-free
+# deb file:///media/mirror/debian sid main contrib non-free-firmware non-free
 
 # Version number of ISO:
 # VERSION="0.0-1"