diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2015-10-21 17:37:14 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-06 19:48:30 +0000 |
| commit | 3c5fca9618241334f40bfd2199cdfabb4fad55ec (patch) | |
| tree | cfcf6aae28bfcd93df11019c9486255ffb440e31 /nixos/modules/system/boot/stage-1.nix | |
| parent | f7aa92177355dc94d7e554cb6b089eb81cb320fa (diff) | |
| download | nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.gz nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.bz2 nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.lz nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.xz nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.tar.zst nixpkgs-3c5fca9618241334f40bfd2199cdfabb4fad55ec.zip | |
filesystems: use list of strings for fs options
Allow usage of list of strings instead of a comma-separated string for filesystem options. Deprecate the comma-separated string style with a warning message; convert this to a hard error after 16.09. 15.09 was just released, so this provides a deprecation period during the 16.03 release. closes #10518 Signed-off-by: Robin Gloster <mail@glob.in>
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1d9a67abcf9..f31620df1d8 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -207,7 +207,7 @@ let (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices); fsInfo = - let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ]; + let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ]; in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems)); setHostId = optionalString (config.networking.hostId != null) '' |