public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initrd: Include filesystem support for /nix, /var etc.

This commit is contained in:
Eelco Dolstra 2014-07-28 22:31:18 +02:00
parent 9bc1676e5a
commit cb7b871bd6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/system/boot/stage-1.nix
View File

@ -313,6 +313,13 @@ in
example = "xz"; 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 { fileSystems = mkOption {
options.neededForBoot = mkOption { options.neededForBoot = mkOption {
default = false; default = false;
@ -347,5 +354,9 @@ in
# Prevent systemd from waiting for the /dev/root symlink. # Prevent systemd from waiting for the /dev/root symlink.
systemd.units."dev-root.device".text = ""; systemd.units."dev-root.device".text = "";
boot.initrd.supportedFilesystems =
map (fs: fs.fsType)
(filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems);
}; };
} }

11
nixos/modules/tasks/filesystems.nix
View File

@ -124,13 +124,6 @@ in
description = "Names of supported filesystem types."; 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.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. # Add the mount helpers to the system path so that `mount' can find them.
system.fsPackages = [ pkgs.dosfstools ]; system.fsPackages = [ pkgs.dosfstools ];