b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
nixos/tests/boot: fix after aa0f27abb0
This commit is contained in:
Janne Heß 2022-04-03 20:52:04 +02:00 committed by GitHub
parent c77281417a 56b4653904
commit 95a0726449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/system/boot/stage-2-init.sh
View file

@ -89,6 +89,11 @@ else
fi
# Required by the activation script
install -m 0755 -d /etc /etc/nixos
install -m 01777 -d /tmp
# Run the script that performs all configuration activation that does
# not have to be done at boot time.
echo "running activation script..."

1
nixos/modules/system/boot/systemd/tmpfiles.nix
View file

@ -102,7 +102,6 @@ in
];
systemd.tmpfiles.rules = [
"d /etc/nixos 0755 root root - -"
"d /nix/var 0755 root root - -"
"L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system"
"d /run/lock 0755 root root - -"

6
nixos/tests/boot.nix
View file

@ -42,7 +42,7 @@ let
nodes = { };
testScript =
''
nodes.machine = create_machine(${machineConfig})
machine = create_machine(${machineConfig})
machine.start()
machine.wait_for_unit("multi-user.target")
machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system")
@ -83,7 +83,7 @@ let
name = "boot-netboot-" + name;
nodes = { };
testScript = ''
nodes.machine = create_machine(${machineConfig})
machine = create_machine(${machineConfig})
machine.start()
machine.wait_for_unit("multi-user.target")
machine.shutdown()
@ -138,7 +138,7 @@ in {
if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0:
raise RuntimeError("Could not create mutable linked image")
nodes.machine = create_machine(${machineConfig})
machine = create_machine(${machineConfig})
machine.start()
machine.wait_for_unit("multi-user.target")
machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system")