From 49130f93b73e61a9e3dff31c3c13c5a9096fa969 Mon Sep 17 00:00:00 2001 From: Dominik Xaver Hörl Date: Mon, 11 Jan 2021 17:23:24 +0100 Subject: nixos/modules-closure.sh: don't fail if firmware is missing Since fdf32154fc90698ef72ffa96ef39d920e1b9c951, we no longer allow missing modules in the initrd. Unfortunately since before this commit, the modules-closure script would also fail on missing firmware, which is a very common case (e.g. xhci-pci.ko.xz lists renesas_usb_fw.mem as dependent firmware). Fix this by only issuing a warning instead. --- pkgs/build-support/kernel/modules-closure.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/build-support/kernel') diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 3f895d9cfed..3b3a38ea1d3 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -81,7 +81,8 @@ for module in $(cat closure); do for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do mkdir -p "$out/lib/firmware/$(dirname "$i")" echo "firmware for $module: $i" - cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi + cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null \ + || echo "WARNING: missing firmware $i for module $module" done done -- cgit 1.4.1