diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
| commit | dd2de66d614e58a8b89046e2de73f2305df4b23f (patch) | |
| tree | f89847bb63642613f543a44e4e270643f6c1c4b7 /nixos/modules/tasks | |
| parent | 99fe4f97c55185d3f51b759cbd5f8e3ab029eadb (diff) | |
| parent | a7d573f224707185c44c92b8a35eb6a7ad62c552 (diff) | |
| download | nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.gz nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.bz2 nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.lz nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.xz nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.zst nixpkgs-dd2de66d614e58a8b89046e2de73f2305df4b23f.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 9dd250f140c..dbe0c9c6e03 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -174,7 +174,7 @@ in # Swap devices. ${flip concatMapStrings config.swapDevices (sw: - "${sw.device} none swap${prioOption sw.priority}\n" + "${sw.realDevice} none swap${prioOption sw.priority}\n" )} ''; |