summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 21:20:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 21:20:09 +0000
commit6f98e852af03882fde37d5ae59d3d331ed2f6164 (patch)
treeef4136fe5d863f072d884b0ca11c8c7fe7845463
parentOnly warn about missing firmware if not in a chroot. (diff)
downloadinitramfs-tools-6f98e852af03882fde37d5ae59d3d331ed2f6164.tar.xz
initramfs-tools-6f98e852af03882fde37d5ae59d3d331ed2f6164.zip
Only warn about missing firmware if not in a container.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/progress-linux/0002-firmware-quiet-container.patch19
-rw-r--r--debian/patches/series1
2 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0002-firmware-quiet-container.patch b/debian/patches/progress-linux/0002-firmware-quiet-container.patch
new file mode 100644
index 0000000..9ab9809
--- /dev/null
+++ b/debian/patches/progress-linux/0002-firmware-quiet-container.patch
@@ -0,0 +1,19 @@
+Author: Baumann <daniel.baumann@progress-linux.org>
+Description: Only warn about missing firmware if not in a container.
+
+diff -Naurp initramfs-tools.orig/hook-functions initramfs-tools/hook-functions
+--- initramfs-tools.orig/hook-functions
++++ initramfs-tools/hook-functions
+@@ -97,6 +97,12 @@ manual_add_modules()
+ continue
+ fi
+
++ # Only warn about missing firmware if
++ # not in a container
++ if ! grep -qs ':cpuset:/$' /proc/1/cgroup; then
++ continue
++ fi
++
+ kmod_modname="${kmod##*/}"
+ kmod_modname="${kmod_modname%%.*}"
+ if grep -q "^$kmod_modname\\>" /proc/modules "${CONFDIR}/modules"; then
diff --git a/debian/patches/series b/debian/patches/series
index 38f96bc..d910616 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
progress-linux/0001-firmware-quiet-chroot.patch
+progress-linux/0002-firmware-quiet-container.patch