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

nixos: tasks/fileSystems: cleanup

Browse Source
This commit is contained in:
Jan Malakhovski 2015-11-25 19:09:43 +00:00
parent 1266852fd8
commit 2c8ca0d1bd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,14 +208,15 @@ in
formatDevice = fs: formatDevice = fs:
let let
mountPoint' = escapeSystemdPath fs.mountPoint; mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount";
device' = escapeSystemdPath fs.device; device' = escapeSystemdPath fs.device;
device'' = "${device}.device";
in nameValuePair "mkfs-${device'}" in nameValuePair "mkfs-${device'}"
{ description = "Initialisation of Filesystem ${fs.device}"; { description = "Initialisation of Filesystem ${fs.device}";
wantedBy = [ "${mountPoint'}.mount" ]; wantedBy = [ mountPoint' ];
before = [ "${mountPoint'}.mount" "systemd-fsck@${device'}.service" ]; before = [ mountPoint' "systemd-fsck@${device'}.service" ];
requires = [ "${device'}.device" ]; requires = [ device'' ];
after = [ "${device'}.device" ]; after = [ device'' ];
path = [ pkgs.utillinux ] ++ config.system.fsPackages; path = [ pkgs.utillinux ] ++ config.system.fsPackages;
script = script =
'' ''