diff options
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 11 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index b6249b6c0915..01558b8f9b28 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -313,6 +313,13 @@ in example = "xz"; }; + boot.initrd.supportedFilesystems = mkOption { + default = [ ]; + example = [ "btrfs" ]; + type = types.listOf types.string; + description = "Names of supported filesystem types in the initial ramdisk."; + }; + fileSystems = mkOption { options.neededForBoot = mkOption { default = false; @@ -347,5 +354,9 @@ in # Prevent systemd from waiting for the /dev/root symlink. systemd.units."dev-root.device".text = ""; + boot.initrd.supportedFilesystems = + map (fs: fs.fsType) + (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); + }; } diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d350bc1b5d0e..4de16a776d42 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -124,13 +124,6 @@ in description = "Names of supported filesystem types."; }; - boot.initrd.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.string; - description = "Names of supported filesystem types in the initial ramdisk."; - }; - }; @@ -140,10 +133,6 @@ in boot.supportedFilesystems = map (fs: fs.fsType) fileSystems; - boot.initrd.supportedFilesystems = - map (fs: fs.fsType) - (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); - # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; |