From a7d238136d9d2cbc88026d981c2e0f515fcf0229 Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 31 Aug 2016 14:34:08 +0100 Subject: [PATCH] =?UTF-8?q?nixos/=E2=80=A6/swap.nix:=20remove=20backslashe?= =?UTF-8?q?s=20from=20deviceName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #8277 Prior to this, backslashes would end up in fstab and the swap partition was not activated. Swap files seemed to work fine. --- nixos/modules/config/swap.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 62b6e011713e..968bb22f354c 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -54,6 +54,10 @@ let WARNING: Don't try to hibernate when you have at least one swap partition with this option enabled! We have no way to set the partition into which hibernation image is saved, so if your image ends up on an encrypted one you would lose it! + + WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device + when using randomEncryption as the UUIDs and labels will get erased on every boot when + the partition is encrypted. Best to use /dev/disk/by-partuuid/… ''; }; @@ -72,7 +76,7 @@ let config = rec { device = mkIf options.label.isDefined "/dev/disk/by-label/${config.label}"; - deviceName = escapeSystemdPath config.device; + deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device); realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device; };