···

       
423
       
 
       


     

       
424
       
 
       
- The `bind` module now allows the per-zone `allow-query` setting to be configured (previously it was hard-coded to `any`; it still defaults to `any` to retain compatibility).

     

       
425
       
 
       


     

       
0
       
 
       

     

       
0
       
 
       

     

       
426
       
 
       
## Detailed migration information {#sec-release-23.05-migration}

     

       
427
       
 
       


     

       
428
       
 
       
### Pipewire configuration overrides {#sec-release-23.05-migration-pipewire}

     

···

       
423
       
 
       


     

       
424
       
 
       
- The `bind` module now allows the per-zone `allow-query` setting to be configured (previously it was hard-coded to `any`; it still defaults to `any` to retain compatibility).

     

       
425
       
 
       


     

       
426
       
+
       
- `make-disk-image` handles `contents` arguments that are directories better, fixing a bug where it used to put them in a subdirectory of the intended `target`.

     

       
427
       
+
       


     

       
428
       
 
       
## Detailed migration information {#sec-release-23.05-migration}

     

       
429
       
 
       


     

       
430
       
 
       
### Pipewire configuration overrides {#sec-release-23.05-migration-pipewire}

     

···

       
402
       
 
       
        done

     

       
403
       
 
       
      else

     

       
404
       
 
       
        mkdir -p $root/$(dirname $target)

     

       
405
       
-
       
        if ! [ -e $root/$target ]; then

     

       
406
       
-
       
          rsync $rsync_flags $source $root/$target

     

       
407
       
-
       
        else

     

       
408
       
 
       
          echo "duplicate entry $target -> $source"

     

       
409
       
 
       
          exit 1

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
410
       
 
       
        fi

     

       
411
       
 
       
      fi

     

       
412
       
 
       
    done

     

···

       
402
       
 
       
        done

     

       
403
       
 
       
      else

     

       
404
       
 
       
        mkdir -p $root/$(dirname $target)

     

       
405
       
+
       
        if [ -e $root/$target ]; then

     

       
0
       
 
       

     

       
0
       
 
       

     

       
406
       
 
       
          echo "duplicate entry $target -> $source"

     

       
407
       
 
       
          exit 1

     

       
408
       
+
       
        elif [ -d $source ]; then

     

       
409
       
+
       
          # Append a slash to the end of source to get rsync to copy the

     

       
410
       
+
       
          # directory _to_ the target instead of _inside_ the target.

     

       
411
       
+
       
          # (See `man rsync`'s note on a trailing slash.)

     

       
412
       
+
       
          rsync $rsync_flags $source/ $root/$target

     

       
413
       
+
       
        else

     

       
414
       
+
       
          rsync $rsync_flags $source $root/$target

     

       
415
       
 
       
        fi

     

       
416
       
 
       
      fi

     

       
417
       
 
       
    done

     

···

       
17
       
 
       
          ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key

     

       
18
       
 
       
        '';

     

       
19
       
 
       
      };

     

       
0
       
 
       

     

       
20
       
 
       
    in makeTest {

     

       
21
       
 
       
      name = "ec2-" + name;

     

       
22
       
 
       
      nodes = {};

     
···

       
35
       
 
       
                "qemu-img",

     

       
36
       
 
       
                "create",

     

       
37
       
 
       
                "-f",

     

       
0
       
 
       

     

       
0
       
 
       

     

       
38
       
 
       
                "qcow2",

     

       
39
       
 
       
                "-o",

     

       
40
       
 
       
                "backing_file=${image}",

     
···

       
59
       
 
       
        )

     

       
60
       
 
       


     

       
61
       
 
       
        machine = create_machine({"startCommand": start_command})

     

       
62
       
-
       
      '' + script;

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
63
       
 
       


     

       
64
       
 
       
      inherit meta;

     

       
65
       
 
       
    };

     

···

       
17
       
 
       
          ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key

     

       
18
       
 
       
        '';

     

       
19
       
 
       
      };

     

       
20
       
+
       
      indentLines = str: concatLines (map (s: "  " + s) (splitString "\n" str));

     

       
21
       
 
       
    in makeTest {

     

       
22
       
 
       
      name = "ec2-" + name;

     

       
23
       
 
       
      nodes = {};

     
···

       
36
       
 
       
                "qemu-img",

     

       
37
       
 
       
                "create",

     

       
38
       
 
       
                "-f",

     

       
39
       
+
       
                "qcow2",

     

       
40
       
+
       
                "-F",

     

       
41
       
 
       
                "qcow2",

     

       
42
       
 
       
                "-o",

     

       
43
       
 
       
                "backing_file=${image}",

     
···

       
62
       
 
       
        )

     

       
63
       
 
       


     

       
64
       
 
       
        machine = create_machine({"startCommand": start_command})

     

       
65
       
+
       
        try:

     

       
66
       
+
       
      '' + indentLines script + ''

     

       
67
       
+
       
        finally:

     

       
68
       
+
       
          machine.shutdown()

     

       
69
       
+
       
      '';

     

       
70
       
 
       


     

       
71
       
 
       
      inherit meta;

     

       
72
       
 
       
    };

     

···

       
27
       
 
       
    inherit pkgs config;

     

       
28
       
 
       
    lib = pkgs.lib;

     

       
29
       
 
       
    format = "qcow2";

     

       
30
       
-
       
    contents = [{

     

       
31
       
-
       
      source = pkgs.writeText "testFile" "contents";

     

       
32
       
-
       
      target = "/testFile";

     

       
33
       
-
       
      user = "1234";

     

       
34
       
-
       
      group = "5678";

     

       
35
       
-
       
      mode = "755";

     

       
36
       
-
       
    }];

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
37
       
 
       
  }) + "/nixos.qcow2";

     

       
38
       
 
       


     

       
39
       
 
       
in makeEc2Test {

     
···

       
42
       
 
       
  userData = null;

     

       
43
       
 
       
  script = ''

     

       
44
       
 
       
    machine.start()

     

       
0
       
 
       

     

       
45
       
 
       
    assert "content" in machine.succeed("cat /testFile")

     

       
46
       
 
       
    fileDetails = machine.succeed("ls -l /testFile")

     

       
47
       
 
       
    assert "1234" in fileDetails

     

       
48
       
 
       
    assert "5678" in fileDetails

     

       
49
       
 
       
    assert "rwxr-xr-x" in fileDetails

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
50
       
 
       
  '';

     

       
51
       
 
       
}

     

···

       
27
       
 
       
    inherit pkgs config;

     

       
28
       
 
       
    lib = pkgs.lib;

     

       
29
       
 
       
    format = "qcow2";

     

       
30
       
+
       
    contents = [

     

       
31
       
+
       
      {

     

       
32
       
+
       
        source = pkgs.writeText "testFile" "contents";

     

       
33
       
+
       
        target = "/testFile";

     

       
34
       
+
       
        user = "1234";

     

       
35
       
+
       
        group = "5678";

     

       
36
       
+
       
        mode = "755";

     

       
37
       
+
       
      }

     

       
38
       
+
       
      {

     

       
39
       
+
       
        source = ./.;

     

       
40
       
+
       
        target = "/testDir";

     

       
41
       
+
       
      }

     

       
42
       
+
       
    ];

     

       
43
       
 
       
  }) + "/nixos.qcow2";

     

       
44
       
 
       


     

       
45
       
 
       
in makeEc2Test {

     
···

       
48
       
 
       
  userData = null;

     

       
49
       
 
       
  script = ''

     

       
50
       
 
       
    machine.start()

     

       
51
       
+
       
    # Test that if contents includes a file, it is copied to the target.

     

       
52
       
 
       
    assert "content" in machine.succeed("cat /testFile")

     

       
53
       
 
       
    fileDetails = machine.succeed("ls -l /testFile")

     

       
54
       
 
       
    assert "1234" in fileDetails

     

       
55
       
 
       
    assert "5678" in fileDetails

     

       
56
       
 
       
    assert "rwxr-xr-x" in fileDetails

     

       
57
       
+
       


     

       
58
       
+
       
    # Test that if contents includes a directory, it is copied to the target.

     

       
59
       
+
       
    dirList = machine.succeed("ls /testDir")

     

       
60
       
+
       
    assert "image-contents.nix" in dirList

     

       
61
       
 
       
  '';

     

       
62
       
 
       
}