mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

Merge pull request #336513 from nikstur/etc-overlay-fixes

Browse source 
etc.overlay fixes
This commit is contained in:
nikstur 2024-08-22 13:57:04 +02:00 committed by GitHub
parent f5eb7e48a1 7845b89e24
commit e7b7271ffc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/etc/etc-activation.nix
View file

@ -64,7 +64,7 @@
] ++ lib.optionals (!config.system.etc.overlay.mutable) [
"ro"
]);
wantedBy = [ "initrd-fs.target" ];
requiredBy = [ "initrd-fs.target" ];
before = [ "initrd-fs.target" ];
requires = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ];
after = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ];

2
nixos/modules/system/etc/etc.nix
View file

@ -279,7 +279,7 @@ in
${pkgs.move-mount-beneath}/bin/move-mount --move --beneath $tmpEtcMount /etc
# Unmount the top /etc mount to atomically reveal the new mount.
umount --recursive /etc
umount --lazy --recursive /etc
fi
'' else ''
# Set up the statically computed bits of /etc.