movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge pull request #314579 from ivan770/etc-direct-symlinks

Browse source 
nixos/etc: support direct symlinks with etc overlay
This commit is contained in:
nikstur 2024-06-13 17:01:35 +02:00 • committed by GitHub
commit 2d15501141
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
nixos/modules/system/etc/build-composefs-dump.py
View file

@ -175,7 +175,7 @@ def main() -> None:
paths[glob_target] = composefs_path
add_leading_directories(glob_target, attrs, paths)
else: # Without globbing
if mode == "symlink":
if mode == "symlink" or mode == "direct-symlink":
composefs_path = ComposefsPath(
attrs,
# A high approximation of the size of a symlink
@ -184,24 +184,23 @@ def main() -> None:
mode="0777",
payload=source,
)
elif os.path.isdir(source):
composefs_path = ComposefsPath(
attrs,
size=4096,
filetype=FileType.directory,
mode=mode,
payload=source,
)
else:
if os.path.isdir(source):
composefs_path = ComposefsPath(
attrs,
size=4096,
filetype=FileType.directory,
mode=mode,
payload=source,
)
else:
composefs_path = ComposefsPath(
attrs,
size=os.stat(source).st_size,
filetype=FileType.file,
mode=mode,
# payload needs to be relative path in this case
payload=target.lstrip("/"),
)
composefs_path = ComposefsPath(
attrs,
size=os.stat(source).st_size,
filetype=FileType.file,
mode=mode,
# payload needs to be relative path in this case
payload=target.lstrip("/"),
)
paths[target] = composefs_path
add_leading_directories(target, attrs, paths)

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

@ -62,7 +62,7 @@ let
]) etc'}
'';
etcHardlinks = filter (f: f.mode != "symlink") etc';
etcHardlinks = filter (f: f.mode != "symlink" && f.mode != "direct-symlink") etc';
build-composefs-dump = pkgs.runCommand "build-composefs-dump.py"
{