Skip to content

T7836: move bind mount of /config to vyos-1x - #4732

Merged
c-po merged 2 commits into
vyos:currentfrom
jestabro:simplified-bind-mount
Sep 20, 2025
Merged

T7836: move bind mount of /config to vyos-1x#4732
c-po merged 2 commits into
vyos:currentfrom
jestabro:simplified-bind-mount

Conversation

@jestabro

@jestabro jestabro commented Sep 19, 2025

Copy link
Copy Markdown
Contributor

Change summary

NOTE: This will need to be merged along with vyos/live-boot#8
For success of the tpmtest, the modifications in vyos/vyos-build#1039 are not strictly required, but do enforce naming consistency.

We are removing the bind mount construction from the initrd components in live-boot, as:

  • it is not needed before initialization in the vyos-router script
  • does not correctly update inodes on libc rename
  • fails on the livecd: /var/log/live/boot.log on the livecd contains
    Begin: Configuring VyOS config path ... mount: mounting /root/lib/live/rw/config on /root/opt/vyatta/etc/config failed: No such file or directory
    which has necessitated workarounds, e.g., https://vyos.dev/T5524

During the interval between merges of the this PR and the companion PR vyos/live-boot#8, one would expect to see the following:
This PR merged first: one would expect a recurrence of https://vyos.dev/T668
This PR merged second: an empty /config on installed image --- image will boot and all smoketests pass except for
https://github.com/vyos/vyos-1x/blob/current/smoketest/scripts/cli/test_service_dns_dynamic.py#L206-L212

NOTE: tests below do not reflect tests run will both companion PRs.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

vyos/live-boot#8
vyos/vyos-build#1039

How to test / Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@jestabro jestabro self-assigned this Sep 19, 2025
@github-actions

github-actions Bot commented Sep 19, 2025

Copy link
Copy Markdown

👍
No issues in PR Title / Commit Title

@jestabro

jestabro commented Sep 19, 2025

Copy link
Copy Markdown
Contributor Author

Move to draft to investigate tmptest issue with image built from companion PRs.
This will require some discussion with @sarthurdev

@jestabro
jestabro marked this pull request as ready for review September 19, 2025 17:05
We are removing the bind mount construction from the initrd components
in live-boot, as:
(1) it is not needed before initialization in the vyos-router script
(2) does not correctly update inodes on libc rename
(3) fails on the livecd (cf. /var/log/live/boot.log)
The mount point /opt/vyatta/etc/config is considered the source of truth
whereas /config is simply a bind mount of convenience. As the latter is
no longer defined at boot, all operations should use the former.
@jestabro
jestabro force-pushed the simplified-bind-mount branch from 7af8300 to 2d32d32 Compare September 19, 2025 17:10
@jestabro

jestabro commented Sep 19, 2025

Copy link
Copy Markdown
Contributor Author

Add commit with update for tpm. Discussed briefly with @sarthurdev , who will review.

@sarthurdev sarthurdev left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Changes look good. TPM script issue is resolved and using vyos.defaults is a great idea.

@github-actions

Copy link
Copy Markdown

CI integration ❌ failed!

Details

CI logs

  • CLI Smoketests (no interfaces) ❌ failed
  • CLI Smoketests VPP 👍 passed
  • CLI Smoketests (interfaces only) 👍 passed
  • Config tests 👍 passed
  • Config tests VPP 👍 passed
  • RAID1 tests 👍 passed
  • TPM tests 👍 passed

@c-po c-po left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Simplify code and remove additions from live-boot package. Maybe one day we can return to the upstrem live-boot package.

@c-po
c-po merged commit 91afb69 into vyos:current Sep 20, 2025
27 of 29 checks passed
@vyosbot vyosbot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Sep 20, 2025
@jestabro
jestabro deleted the simplified-bind-mount branch May 4, 2026 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

4 participants