mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-24 02:00:41 +03:00
Merge master into staging-next
This commit is contained in:
commit
44e4abfaf6
95 changed files with 1099 additions and 7521 deletions
|
@ -268,10 +268,10 @@ in
|
|||
|
||||
${lib.optionalString config.system.etc.overlay.mutable ''
|
||||
# These directories are usually created in initrd,
|
||||
# but we need to create them here when we didn't we're called directly,
|
||||
# but we need to create them here when we're called directly,
|
||||
# for instance by nixos-enter
|
||||
mkdir --parents /.rw-etc/upper /.rw-etc/work
|
||||
chmod --recursive 0755 /.rw-etc
|
||||
chmod 0755 /.rw-etc /.rw-etc/upper /.rw-etc/work
|
||||
''}
|
||||
|
||||
tmpMetadataMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue