Use ln -sf otherwise nanobsd.sh -wkWK failssince the etc link exists already.
ClosedPublic
Actions

Authored by mr on Apr 17 2025, 11:20 AM.

Details

Reviewers

imp

Commits

rG6ebab5e6bbec: Use ln -sf otherwise nanobsd.sh -wkWK fails

Summary

Before creating the nanobsd image nanobsd.sh creates a soft link for
usr/local/etc in the function setup_nanobsd()
This fails if the link already exists (when using nanobsd.sh -wkWK)

Test Plan

Run nanobsd.sh -c someconfig and then nanobsd.sh -wkWK -c someconfig
which fails.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

mr requested review of this revision.Apr 17 2025, 11:20 AM

mr created this revision.

Harbormaster completed remote builds in B63560: Diff 153771.Apr 17 2025, 11:20 AM

mr retitled this revision from Use ln -sf otherwise nanobsd.sh -wkWK fails since the etc link exists already. to Use ln -sf otherwise nanobsd.sh -wkWK failssince the etc link exists already..Apr 17 2025, 11:24 AM

mr edited the summary of this revision. (Show Details)

mr edited the test plan for this revision. (Show Details)

jlduran added a subscriber: jlduran.Apr 17 2025, 11:37 AM

jlduran mentioned this in D48782: nanobsd: Make tgt_dir2symlink() take a mode.Apr 17 2025, 11:45 AM

That's kinda obscure... But this is harmless and likely good defensive programming...
and it makes sense for the 'rebuild' cases which in spots are poorly thought out.

This revision is now accepted and ready to land.Apr 17 2025, 1:23 PM

Closed by commit rG6ebab5e6bbec: Use ln -sf otherwise nanobsd.sh -wkWK fails (authored by mr). · Explain WhyApr 17 2025, 3:00 PM

This revision was automatically updated to reflect the committed changes.

mr added a commit: rG6ebab5e6bbec: Use ln -sf otherwise nanobsd.sh -wkWK fails.

I was not able to reproduce the failure. But it is safe to always have it, just like rm -f, when the user has -i aliased to rm and ln (e.g., `alias rm='rm -i' uncommented in the "be paranoid" section).
This change should not get reverted with D48782, as it does essentially the same thing.
Thank you!