commit ee9becfdfb418b471b5bdb36f302e9c77a40b44b · pyrox.dev/nixpkgs

+2 -2

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

···

       3
       3
        
       let

     

       4
       4
        
         cfg = config.systemd.sysupdate;

     

       5
       5
        
       

     

       6
       6
       -
         format = pkgs.formats.ini { };

     

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

     

       7
       7
        
       

     

       8
       8
        
         definitionsDirectory = utils.systemdUtils.lib.definitions

     

       9
       9
        
           "sysupdate.d"

     
···

       79
       79
        
                 Source = {

     

       80
       80
        
                   Type = "url-file";

     

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

     

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

     

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

     

       83
       83
        
                 };

     

       84
       84
        
       

     

       85
       85
        
                 Target = {

+7 -7

nixos/tests/systemd-sysupdate.nix

···

       23
       23
        
                   mkdir -p $out

     

       24
       24
        
                   cd $out

     

       25
       25
        
       

     

       26
       26
       -
                   echo "nixos" > nixos_1.efi

     

       27
       27
       -
                   sha256sum nixos_1.efi > SHA256SUMS

     

       26
       26
       +
                   echo "nixos" > nixos_1.txt

     

       27
       27
       +
                   sha256sum nixos_1.txt > SHA256SUMS

     

       28
       28
        
       

     

       29
       29
        
                   export GNUPGHOME="$(mktemp -d)"

     

       30
       30
        
                   cp -R ${gpgKeyring}/* $GNUPGHOME

     
···

       39
       39
        
             systemd.sysupdate = {

     

       40
       40
        
               enable = true;

     

       41
       41
        
               transfers = {

     

       42
       42
       -
                 "uki" = {

     

       42
       42
       +
                 "text-file" = {

     

       43
       43
        
                   Source = {

     

       44
       44
        
                     Type = "url-file";

     

       45
       45
        
                     Path = "http://server/";

     

       46
       46
       -
                     MatchPattern = "nixos_@v.efi";

     

       46
       46
       +
                     MatchPattern = "nixos_@v.txt";

     

       47
       47
        
                   };

     

       48
       48
        
                   Target = {

     

       49
       49
       -
                     Path = "/boot/EFI/Linux";

     

       50
       50
       -
                     MatchPattern = "nixos_@v.efi";

     

       49
       49
       +
                     Path = "/";

     

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

     

       51
       51
        
                   };

     

       52
       52
        
                 };

     

       53
       53
        
               };

     
···

       61
       61
        
           server.wait_for_unit("nginx.service")

     

       62
       62
        
       

     

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

     

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

     

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

     

       65
       65
        
         '';

     

       66
       66
        
       }