commit 0c02b3076c7151eb5e4945e05c834bdc4ca3cd3b · pyrox.dev/nixpkgs

+18 -2

nixos/modules/system/etc/etc.nix

···

       231
       231
        
             if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]] && [[ "${config.system.build.etc}/etc" != "$(readlink -f /run/current-system/etc)" ]]; then

     

       232
       232
        
               echo "remounting /etc..."

     

       233
       233
        
       

     

       234
       234
       -
               tmpMetadataMount=$(mktemp --directory)

     

       234
       234
       +
               tmpMetadataMount=$(mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX)

     

       235
       235
        
               mount --type erofs ${config.system.build.etcMetadataImage} $tmpMetadataMount

     

       236
       236
        
       

     

       237
       237
        
               # Mount the new /etc overlay to a temporary private mount.

     

       238
       238
        
               # This needs the indirection via a private bind mount because you

     

       239
       239
        
               # cannot move shared mounts.

     

       240
       240
       -
               tmpEtcMount=$(mktemp --directory)

     

       240
       240
       +
               tmpEtcMount=$(mktemp --directory -t nixos-etc.XXXXXXXXXX)

     

       241
       241
        
               mount --bind --make-private $tmpEtcMount $tmpEtcMount

     

       242
       242
        
               mount --type overlay overlay \

     

       243
       243
        
                 --options lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \

     
···

       276
       276
        
       

     

       277
       277
        
               # Unmount the top /etc mount to atomically reveal the new mount.

     

       278
       278
        
               umount --lazy --recursive /etc

     

       279
       279
       +
       

     

       280
       280
       +
               # Unmount the temporary mount

     

       281
       281
       +
               umount --lazy "$tmpEtcMount"

     

       282
       282
       +
               rmdir "$tmpEtcMount"

     

       283
       283
       +
       

     

       284
       284
       +
               # Unmount old metadata mounts

     

       285
       285
       +
               # For some reason, `findmnt /tmp --submounts` does not show the nested

     

       286
       286
       +
               # mounts. So we'll just find all mounts of type erofs and filter on the

     

       287
       287
       +
               # name of the mountpoint.

     

       288
       288
       +
               findmnt --type erofs --list --kernel --output TARGET | while read -r mountPoint; do

     

       289
       289
       +
                 if [[ "$mountPoint" =~ ^/tmp/nixos-etc-metadata\..{10}$ &&

     

       290
       290
       +
                       "$mountPoint" != "$tmpMetadataMount" ]]; then

     

       291
       291
       +
                   umount --lazy $mountPoint

     

       292
       292
       +
                   rmdir "$mountPoint"

     

       293
       293
       +
                 fi

     

       294
       294
       +
               done

     

       279
       295
        
             fi

     

       280
       296
        
           '' else ''

     

       281
       297
        
             # Set up the statically computed bits of /etc.

+14 -1

nixos/tests/activation/etc-overlay-immutable.nix

···

       27
       27
        
           specialisation.new-generation.configuration = {

     

       28
       28
        
             environment.etc."newgen".text = "newgen";

     

       29
       29
        
           };

     

       30
       30
       +
           specialisation.newer-generation.configuration = {

     

       31
       31
       +
             environment.etc."newergen".text = "newergen";

     

       32
       32
       +
           };

     

       30
       33
        
         };

     

       31
       34
        
       

     

       32
       32
       -
         testScript = ''

     

       35
       35
       +
         testScript = /* python */ ''

     

       36
       36
       +
           newergen = machine.succeed("realpath /run/current-system/specialisation/newer-generation/bin/switch-to-configuration").rstrip()

     

       37
       37
       +
       

     

       33
       38
        
           with subtest("/run/etc-metadata/ is mounted"):

     

       34
       39
        
             print(machine.succeed("mountpoint /run/etc-metadata"))

     

       35
       40
        
       

     
···

       79
       84
        
             print(machine.succeed("ls /etc/mountpoint"))

     

       80
       85
        
             print(machine.succeed("stat /etc/mountpoint/extra-file"))

     

       81
       86
        
             print(machine.succeed("findmnt /etc/filemount"))

     

       87
       87
       +
       

     

       88
       88
       +
             machine.succeed(f"{newergen} switch")

     

       89
       89
       +
       

     

       90
       90
       +
             tmpMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc\\..*' | wc -l").rstrip()

     

       91
       91
       +
             metaMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc-metadata\\..*' | wc -l").rstrip()

     

       92
       92
       +
       

     

       93
       93
       +
             assert tmpMounts == "0", f"Found {tmpMounts} remaining tmpmounts"

     

       94
       94
       +
             assert metaMounts == "1", f"Found {metaMounts} remaining metamounts"

     

       82
       95
        
         '';

     

       83
       96
        
       }

+15 -1

nixos/tests/activation/etc-overlay-mutable.nix

···

       15
       15
        
           specialisation.new-generation.configuration = {

     

       16
       16
        
             environment.etc."newgen".text = "newgen";

     

       17
       17
        
           };

     

       18
       18
       +
           specialisation.newer-generation.configuration = {

     

       19
       19
       +
             environment.etc."newergen".text = "newergen";

     

       20
       20
       +
           };

     

       18
       21
        
         };

     

       19
       22
        
       

     

       20
       20
       -
         testScript = ''

     

       23
       23
       +
         testScript = /* python */ ''

     

       24
       24
       +
           newergen = machine.succeed("realpath /run/current-system/specialisation/newer-generation/bin/switch-to-configuration").rstrip()

     

       25
       25
       +
       

     

       21
       26
        
           with subtest("/run/etc-metadata/ is mounted"):

     

       22
       27
        
             print(machine.succeed("mountpoint /run/etc-metadata"))

     

       23
       28
        
       

     
···

       55
       60
        
             print(machine.succeed("findmnt /etc/mountpoint"))

     

       56
       61
        
             print(machine.succeed("stat /etc/mountpoint/extra-file"))

     

       57
       62
        
             print(machine.succeed("findmnt /etc/filemount"))

     

       63
       63
       +
       

     

       64
       64
       +
             machine.succeed(f"{newergen} switch")

     

       65
       65
       +
             assert machine.succeed("cat /etc/newergen") == "newergen"

     

       66
       66
       +
       

     

       67
       67
       +
             tmpMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc\\..*' | wc -l").rstrip()

     

       68
       68
       +
             metaMounts = machine.succeed("find /tmp -maxdepth 1 -type d -regex '/tmp/nixos-etc-metadata\\..*' | wc -l").rstrip()

     

       69
       69
       +
       

     

       70
       70
       +
             assert tmpMounts == "0", f"Found {tmpMounts} remaining tmpmounts"

     

       71
       71
       +
             assert metaMounts == "1", f"Found {metaMounts} remaining metamounts"

     

       58
       72
        
         '';

     

       59
       73
        
       }