diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 12:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-21 12:01:45 +0000 |
| commit | 682b6995b4fb228537ec40175d748cf9d783198d (patch) | |
| tree | 45ab803851a603b15a7dca614ee8159b425e4b7d /pkgs/build-support | |
| parent | e5968ce78890712425ce023df88bcdb781130f02 (diff) | |
| parent | 0c34dab04fdaac76bdd9dc21d35e9f2ebe22ea75 (diff) | |
| download | nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.tar nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.tar.gz nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.tar.bz2 nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.tar.lz nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.tar.xz nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.tar.zst nixpkgs-682b6995b4fb228537ec40175d748cf9d783198d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd-ng/src/main.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 53096a84232..daa688976c6 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -195,7 +195,7 @@ fn handle_path( .wrap_err_with(|| format!("failed to resolve symlink of {:?}", source))?; // Create the link, then push its target to the queue - if !target.exists() { + if !target.exists() && !target.is_symlink() { unix::fs::symlink(&link_target, &target).wrap_err_with(|| { format!("failed to symlink {:?} to {:?}", link_target, target) })?; |