Unverified Commit ee9becfd authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #285315 from jmbaur/sysupdate-fixes 

nixos/sysupdate: allow lists in sysupdate config
parents d5917b14 514bfa66

nixos/modules/system/boot/systemd/sysupdate.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
let

  cfg = config.systemd.sysupdate;



  format = pkgs.formats.ini { };

  format = pkgs.formats.ini { listToValue = toString; };



  definitionsDirectory = utils.systemdUtils.lib.definitions

    "sysupdate.d"
@@ -79,7 +79,7 @@ in 
          Source = {

            Type = "url-file";

            Path = "https://download.example.com/";

            MatchPattern = "nixos_@v.efi.xz";

            MatchPattern = [ "nixos_@v+@l-@d.efi" "nixos_@v+@l.efi" "nixos_@v.efi" ];

          };



          Target = {

nixos/tests/systemd-sysupdate.nix

+7 −7
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ in 
            mkdir -p $out

            cd $out



            echo "nixos" > nixos_1.efi

            sha256sum nixos_1.efi > SHA256SUMS

            echo "nixos" > nixos_1.txt

            sha256sum nixos_1.txt > SHA256SUMS



            export GNUPGHOME="$(mktemp -d)"

            cp -R ${gpgKeyring}/* $GNUPGHOME
@@ -39,15 +39,15 @@ in 
      systemd.sysupdate = {

        enable = true;

        transfers = {

          "uki" = {

          "text-file" = {

            Source = {

              Type = "url-file";

              Path = "http://server/";

              MatchPattern = "nixos_@v.efi";

              MatchPattern = "nixos_@v.txt";

            };

            Target = {

              Path = "/boot/EFI/Linux";

              MatchPattern = "nixos_@v.efi";

              Path = "/";

              MatchPattern = [ "nixos_@v.txt" ];

            };

          };

        };
@@ -61,6 +61,6 @@ in 
    server.wait_for_unit("nginx.service")



    target.succeed("systemctl start systemd-sysupdate")

    assert "nixos" in target.wait_until_succeeds("cat /boot/EFI/Linux/nixos_1.efi", timeout=5)

    assert "nixos" in target.wait_until_succeeds("cat /nixos_1.txt", timeout=5)

  '';

}