commit 6bf4cde63f78b2d58346d2574beb6c49c23ff247 · pyrox.dev/nixpkgs

+2

nixos/doc/manual/release-notes/rl-2305.section.md

···

       423
       423
        
       

     

       424
       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
       425
        
       

     

       426
       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
       427
       +
       

     

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

     

       427
       429
        
       

     

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

+8 -3

nixos/lib/make-disk-image.nix

···

       402
       402
        
               done

     

       403
       403
        
             else

     

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

     

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

     

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

     

       407
       407
       -
               else

     

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

     

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

     

       409
       407
        
                 exit 1

     

       408
       408
       +
               elif [ -d $source ]; then

     

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

     

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

     

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

     

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

     

       413
       413
       +
               else

     

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

     

       410
       415
        
               fi

     

       411
       416
        
             fi

     

       412
       417
        
           done

+8 -1

nixos/tests/common/ec2.nix

···

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

     

       18
       18
        
               '';

     

       19
       19
        
             };

     

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

     

       20
       21
        
           in makeTest {

     

       21
       22
        
             name = "ec2-" + name;

     

       22
       23
        
             nodes = {};

     
···

       35
       36
        
                       "qemu-img",

     

       36
       37
        
                       "create",

     

       37
       38
        
                       "-f",

     

       39
       39
       +
                       "qcow2",

     

       40
       40
       +
                       "-F",

     

       38
       41
        
                       "qcow2",

     

       39
       42
        
                       "-o",

     

       40
       43
        
                       "backing_file=${image}",

     
···

       59
       62
        
               )

     

       60
       63
        
       

     

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

     

       62
       62
       -
             '' + script;

     

       65
       65
       +
               try:

     

       66
       66
       +
             '' + indentLines script + ''

     

       67
       67
       +
               finally:

     

       68
       68
       +
                 machine.shutdown()

     

       69
       69
       +
             '';

     

       63
       70
        
       

     

       64
       71
        
             inherit meta;

     

       65
       72
        
           };

+18 -7

nixos/tests/image-contents.nix

···

       27
       27
        
           inherit pkgs config;

     

       28
       28
        
           lib = pkgs.lib;

     

       29
       29
        
           format = "qcow2";

     

       30
       30
       -
           contents = [{

     

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

     

       32
       32
       -
             target = "/testFile";

     

       33
       33
       -
             user = "1234";

     

       34
       34
       -
             group = "5678";

     

       35
       35
       -
             mode = "755";

     

       36
       36
       -
           }];

     

       30
       30
       +
           contents = [

     

       31
       31
       +
             {

     

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

     

       33
       33
       +
               target = "/testFile";

     

       34
       34
       +
               user = "1234";

     

       35
       35
       +
               group = "5678";

     

       36
       36
       +
               mode = "755";

     

       37
       37
       +
             }

     

       38
       38
       +
             {

     

       39
       39
       +
               source = ./.;

     

       40
       40
       +
               target = "/testDir";

     

       41
       41
       +
             }

     

       42
       42
       +
           ];

     

       37
       43
        
         }) + "/nixos.qcow2";

     

       38
       44
        
       

     

       39
       45
        
       in makeEc2Test {

     
···

       42
       48
        
         userData = null;

     

       43
       49
        
         script = ''

     

       44
       50
        
           machine.start()

     

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

     

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

     

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

     

       47
       54
        
           assert "1234" in fileDetails

     

       48
       55
        
           assert "5678" in fileDetails

     

       49
       56
        
           assert "rwxr-xr-x" in fileDetails

     

       57
       57
       +
       

     

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

     

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

     

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

     

       50
       61
        
         '';

     

       51
       62
        
       }