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

Merge pull request #30339 from pvgoran/fileSystems-silentFormatOptions

Browse Source 
filesystems: use non-interactive formatOptions by default
This commit is contained in:
Franz Pletz 2017-10-25 10:46:46 +02:00 committed by GitHub
commit 666d9c09c1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,11 +115,18 @@ let
};
config = {
options = mkIf config.autoResize [ "x-nixos.autoresize" ];
config = let
defaultFormatOptions =
# -F needed to allow bare block device without partitions
formatOptions = mkIf ((builtins.substring 0 3 config.fsType) == "ext") (mkDefault "-F");
if (builtins.substring 0 3 config.fsType) == "ext" then "-F"
# -q needed for non-interactive operations
else if config.fsType == "jfs" then "-q"
# (same here)
else if config.fsType == "reiserfs" then "-q"
else null;
in {
options = mkIf config.autoResize [ "x-nixos.autoresize" ];
formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions);
};
};