colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/etc: make re-mounting /etc overlay idempotent

Browse Source
This commit is contained in:
nikstur 2024-02-21 22:54:00 +01:00
parent 1e1efbcf8c
commit 5df8caced4
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/etc/etc.nix
View File

@ -238,7 +238,9 @@ in
# this should not run because /etc is mounted via a systemd mount unit # this should not run because /etc is mounted via a systemd mount unit
# instead. To a large extent this mimics what composefs does. Because # instead. To a large extent this mimics what composefs does. Because
# it's relatively simple, however, we avoid the composefs dependency. # it's relatively simple, however, we avoid the composefs dependency.
if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]]; then # Since this script is not idempotent, it should not run when etc hasn't
# changed.
if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]] && [[ "${config.system.build.etc}/etc" != "$(readlink -f /run/current-system/etc)" ]]; then
echo "remounting /etc..." echo "remounting /etc..."
tmpMetadataMount=$(mktemp --directory) tmpMetadataMount=$(mktemp --directory)

14
nixos/tests/activation/etc-overlay-immutable.nix
View File

@ -20,11 +20,17 @@
}; };
testScript = '' testScript = ''
machine.succeed("findmnt --kernel --type overlay /etc") with subtest("/etc is mounted as an overlay"):
machine.fail("stat /etc/newgen") machine.succeed("findmnt --kernel --type overlay /etc")
machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") with subtest("switching to the same generation"):
machine.succeed("/run/current-system/bin/switch-to-configuration test")
assert machine.succeed("cat /etc/newgen") == "newgen" with subtest("switching to a new generation"):
machine.fail("stat /etc/newgen")
machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch")
assert machine.succeed("cat /etc/newgen") == "newgen"
''; '';
} }

18
nixos/tests/activation/etc-overlay-mutable.nix
View File

@ -18,13 +18,19 @@
}; };
testScript = '' testScript = ''
machine.succeed("findmnt --kernel --type overlay /etc") with subtest("/etc is mounted as an overlay"):
machine.fail("stat /etc/newgen") machine.succeed("findmnt --kernel --type overlay /etc")
machine.succeed("echo -n 'mutable' > /etc/mutable")
machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") with subtest("switching to the same generation"):
machine.succeed("/run/current-system/bin/switch-to-configuration test")
assert machine.succeed("cat /etc/newgen") == "newgen" with subtest("switching to a new generation"):
assert machine.succeed("cat /etc/mutable") == "mutable" machine.fail("stat /etc/newgen")
machine.succeed("echo -n 'mutable' > /etc/mutable")
machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch")
assert machine.succeed("cat /etc/newgen") == "newgen"
assert machine.succeed("cat /etc/mutable") == "mutable"
''; '';
} }