about summary refs log tree commit diff
path: root/nixos/modules/tasks/filesystems
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-01-13 14:02:30 +0100
committerVladimír Čunát <v@cunat.cz>2021-01-13 14:05:45 +0100
commit8ca33835bae0e9158f0a686dbeb139d979943064 (patch)
treefc64fef17b108e0f66aa6950d9343fc3fae038ce /nixos/modules/tasks/filesystems
parent953455920964e9bf6efaa52e97246516641ee7e9 (diff)
downloadnixlib-8ca33835bae0e9158f0a686dbeb139d979943064.tar
nixlib-8ca33835bae0e9158f0a686dbeb139d979943064.tar.gz
nixlib-8ca33835bae0e9158f0a686dbeb139d979943064.tar.bz2
nixlib-8ca33835bae0e9158f0a686dbeb139d979943064.tar.lz
nixlib-8ca33835bae0e9158f0a686dbeb139d979943064.tar.xz
nixlib-8ca33835bae0e9158f0a686dbeb139d979943064.tar.zst
nixlib-8ca33835bae0e9158f0a686dbeb139d979943064.zip
nixos: fixup build of aarch64 minimal ISO (fixes #109252)
Perhaps it's not pretty nor precise; feel free to improve.
Diffstat (limited to 'nixos/modules/tasks/filesystems')
-rw-r--r--nixos/modules/tasks/filesystems/ext.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index a14a3ac38549..67f6d00ae5c9 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   config = {
@@ -6,7 +6,10 @@
     system.fsPackages = [ pkgs.e2fsprogs ];
 
     # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
-    boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
+    # No ext* modules are present on our aarch64, apparently (and maybe elsewhere).
+    boot.initrd.availableKernelModules =
+      lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64)
+        [ "ext2" "ext4" ];
 
     boot.initrd.extraUtilsCommands =
       ''