pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #167048 from helsinki-systems/fix/test-boot-cdrom

nixos/tests/boot: fix after aa0f27abb06ca66a1dc99493ada65e2bbd6000c9

authored by

Janne Heß and committed by
GitHub 95a07264 c7728141

+8 -4
unified split
+5
nixos/modules/system/boot/stage-2-init.sh
··· 89 89 fi 90 90 91 91 92 + # Required by the activation script 93 + install -m 0755 -d /etc /etc/nixos 94 + install -m 01777 -d /tmp 95 + 96 + 92 97 # Run the script that performs all configuration activation that does 93 98 # not have to be done at boot time. 94 99 echo "running activation script..."
-1
nixos/modules/system/boot/systemd/tmpfiles.nix
··· 102 102 ]; 103 103 104 104 systemd.tmpfiles.rules = [ 105 - "d /etc/nixos 0755 root root - -" 106 105 "d /nix/var 0755 root root - -" 107 106 "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system" 108 107 "d /run/lock 0755 root root - -"
+3 -3
nixos/tests/boot.nix
··· 42 42 nodes = { }; 43 43 testScript = 44 44 '' 45 - nodes.machine = create_machine(${machineConfig}) 45 + machine = create_machine(${machineConfig}) 46 46 machine.start() 47 47 machine.wait_for_unit("multi-user.target") 48 48 machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system") ··· 83 83 name = "boot-netboot-" + name; 84 84 nodes = { }; 85 85 testScript = '' 86 - nodes.machine = create_machine(${machineConfig}) 86 + machine = create_machine(${machineConfig}) 87 87 machine.start() 88 88 machine.wait_for_unit("multi-user.target") 89 89 machine.shutdown() ··· 138 138 if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0: 139 139 raise RuntimeError("Could not create mutable linked image") 140 140 141 - nodes.machine = create_machine(${machineConfig}) 141 + machine = create_machine(${machineConfig}) 142 142 machine.start() 143 143 machine.wait_for_unit("multi-user.target") 144 144 machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system")