diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-11-25 19:09:43 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2016-08-23 18:02:07 +0000 |
| commit | 2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1 (patch) | |
| tree | eed4a1e7dc7dbd86920752e7cb95c0ca545db556 /nixos | |
| parent | 1266852fd8d8143bbe38caff65a3ea7577ffe04a (diff) | |
| download | nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.tar nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.tar.gz nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.tar.bz2 nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.tar.lz nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.tar.xz nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.tar.zst nixpkgs-2c8ca0d1bd1df838b3e3b2d2e17c6855b3b520c1.zip | |
nixos: tasks/fileSystems: cleanup
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index cf8232c3615..b0abf5eda87 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -208,14 +208,15 @@ in formatDevice = fs: let - mountPoint' = escapeSystemdPath fs.mountPoint; - device' = escapeSystemdPath fs.device; + mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount"; + device' = escapeSystemdPath fs.device; + device'' = "${device}.device"; in nameValuePair "mkfs-${device'}" { description = "Initialisation of Filesystem ${fs.device}"; - wantedBy = [ "${mountPoint'}.mount" ]; - before = [ "${mountPoint'}.mount" "systemd-fsck@${device'}.service" ]; - requires = [ "${device'}.device" ]; - after = [ "${device'}.device" ]; + wantedBy = [ mountPoint' ]; + before = [ mountPoint' "systemd-fsck@${device'}.service" ]; + requires = [ device'' ]; + after = [ device'' ]; path = [ pkgs.utillinux ] ++ config.system.fsPackages; script = '' |