Skip to content

T8445: add support for extension of activation system#1156

Merged
dmbaturin merged 2 commits intovyos:currentfrom
jestabro:extend-activation-system
May 1, 2026
Merged

T8445: add support for extension of activation system#1156
dmbaturin merged 2 commits intovyos:currentfrom
jestabro:extend-activation-system

Conversation

@jestabro
Copy link
Copy Markdown
Contributor

@jestabro jestabro commented Apr 6, 2026

Change summary

Add support for extended config activation system: vyos/vyos-1x#5096
(1) Add initialization hint during raw image build, for correct initialization of activation scripts on boot.
(2) Allow overriding of activation init list in flavor files.

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/vyos-1x#5096

How to test / Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • 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 Apr 6, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 6, 2026

👍
No issues in PR Title / Commit Title

@github-actions github-actions Bot added the current VyOS rolling release label Apr 6, 2026
Comment thread scripts/image-build/build-vyos-image Outdated
# branch_name = build_defaults['vyos_branch']
branch_name = 'extend-activation-system'
# url_vyos_1x = os.getenv('VYOS1X_REPO_URL', default='https://github.com/vyos/vyos-1x')
url_vyos_1x = os.getenv('VYOS1X_REPO_URL', default='https://github.com/jestabro/vyos-1x')
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.

Change the default repo to the vyos org

Copy link
Copy Markdown
Contributor Author

@jestabro jestabro Apr 13, 2026

Choose a reason for hiding this comment

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

That is a temporary workaround for the inability for the workflow to see 'inside' build-vyos-image --- it was necessary to run smoketests for vyos/vyos-1x#5096, and will be removed when the later PR is merged.

See my comment here:
vyos/vyos-1x#5096 (comment)

Note that we will have this issue whenever we are making changes to build-vyos-image that rely on vyos-1x changes. Trying to fix in the workflow would likely be more trouble than it's worth.

Comment on lines +146 to +147
from utils import activation_hint
from utils import activation_init
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Two different imports: '_hint' vs '_init'

@jestabro jestabro requested a review from sever-sever April 13, 2026 13:10
@jestabro jestabro force-pushed the extend-activation-system branch from eb2f00b to 6f7809c Compare April 15, 2026 16:30
@jestabro jestabro force-pushed the extend-activation-system branch from 6f7809c to 033929e Compare April 20, 2026 20:24
@jestabro jestabro marked this pull request as ready for review April 20, 2026 20:49
Copy link
Copy Markdown
Member

@c-po c-po left a comment

Choose a reason for hiding this comment

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

Companion PR for getting the new activation system in

@github-actions
Copy link
Copy Markdown

CI integration 👍 passed!

Details

CI logs

  • Config tests 👍 passed

Copy link
Copy Markdown
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

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

I agree the idea is useful, especially for people who want to build highly custom images. I also don't see any issues with the implementation.


# For initialization of activation scripts, we need to know if we
# are building with create_raw_image
if build_config["image_format"] != ["iso"]:
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.

For some reason I find this check aesthetically unsatisfying, although it does the job for sure and I don't see an alternative at the moment.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I agree that it is unsatisfying, and yes, we do not have a clean alternative.

@dmbaturin dmbaturin merged commit f8a364a into vyos:current May 1, 2026
18 of 19 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 May 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

current VyOS rolling release mirror-completed

Development

Successfully merging this pull request may close these issues.

5 participants