movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code 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
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
# instead. To a large extent this mimics what composefs does. Because
# 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..."
tmpMetadataMount=$(mktemp --directory)