Skip to content

Fixed --simulate=diff to show the new target of a replaced symlink - #6438

Merged
nickanderson merged 1 commit into
cfengine:masterfrom
nickanderson:ENT-14713/master
Oct 27, 2026
Merged

nickanderson merged 1 commit into
cfengine:masterfrom
nickanderson:ENT-14713/master

Conversation

@nickanderson

@nickanderson nickanderson commented Oct 25, 2026 •

Copy link
Copy Markdown
Member

With --simulate=diff, when a symlink replaced a link with a wrong target or an obstructing file, the report read the link from the real filesystem instead of the changes chroot: a wrong link showed its old target with the first characters cut off, and an obstruction showed "Invalid target". It now reads the link from the changes chroot and shows the new target.

Ticket: ENT-14713

Comment thread cf-agent/simulate_mode.c Fixed
Comment thread cf-agent/simulate_mode.c Fixed
@nickanderson

Copy link
Copy Markdown
Member Author

@cf-bottom jenkins plese

@cf-bottom

Copy link
Copy Markdown

When a symlink in the changes chroot replaced a link with a wrong target
or an obstructing file, the diff report read the link from the real
filesystem instead of from the changes chroot. A wrong link showed its
old target with the first characters cut off, and an obstruction showed
"Invalid target" because the original was a regular file.

Ticket: ENT-14713
Changelog: Title

@craigcomstock craigcomstock left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems reasonable :)

@nickanderson
nickanderson merged commit 9ca2257 into cfengine:master Oct 27, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants