Unverified Commit d4abba5c authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #232243 from mklca/issue-232229 

nixos/config/swap: resolve swapfile issue !232229
parents e5fc07cb 4101d3b5

nixos/modules/config/swap.nix

+5 −6
Original line number Diff line number Diff line
@@ -275,12 +275,11 @@ in 
                ''}

                ${optionalString sw.randomEncryption.enable ''

                  cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} \

                '' + concatMapStrings (arg: arg + " \\\n") (flatten [

                  ${concatStringsSep " \\\n" (flatten [

                    (optional (sw.randomEncryption.sectorSize != null) "--sector-size=${toString sw.randomEncryption.sectorSize}")

                    (optional (sw.randomEncryption.keySize != null) "--key-size=${toString sw.randomEncryption.keySize}")

                    (optional sw.randomEncryption.allowDiscards "--allow-discards")

                ]) + ''

                  ${sw.device} ${sw.deviceName}

                  ])} ${sw.device} ${sw.deviceName}

                  mkswap ${sw.realDevice}

                ''}

              '';

nixos/tests/swap-file-btrfs.nix

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import ./make-test-python.nix ({ lib, ... }: 


  testScript = ''

    machine.wait_for_unit('var-swapfile.swap')

    # Ensure the swap file creation script ran to completion without failing when creating the swap file

    machine.fail("systemctl is-failed --quiet mkswap-var-swapfile.service")

    machine.succeed("stat --file-system --format=%T /var/swapfile | grep btrfs")

    # First run. Auto creation.

    machine.succeed("swapon --show | grep /var/swapfile")
@@ -41,6 +43,8 @@ import ./make-test-python.nix ({ lib, ... }: 


    # Second run. Use it as-is.

    machine.wait_for_unit('var-swapfile.swap')

    # Ensure the swap file creation script ran to completion without failing when the swap file already exists

    machine.fail("systemctl is-failed --quiet mkswap-var-swapfile.service")

    machine.succeed("swapon --show | grep /var/swapfile")

  '';

})