T8445: add support for extension of activation system#1156
T8445: add support for extension of activation system#1156dmbaturin merged 2 commits intovyos:currentfrom
Conversation
|
👍 |
| # 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') |
There was a problem hiding this comment.
Change the default repo to the vyos org
There was a problem hiding this comment.
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.
| from utils import activation_hint | ||
| from utils import activation_init |
There was a problem hiding this comment.
Two different imports: '_hint' vs '_init'
eb2f00b to
6f7809c
Compare
When building raw images, leave hint to indicate activiation init on boot.
6f7809c to
033929e
Compare
c-po
left a comment
There was a problem hiding this comment.
Companion PR for getting the new activation system in
|
CI integration 👍 passed! Details
|
dmbaturin
left a comment
There was a problem hiding this comment.
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"]: |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
I agree that it is unsatisfying, and yes, we do not have a clean alternative.
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
Related Task(s)
Related PR(s)
vyos/vyos-1x#5096
How to test / Smoketest result
Checklist: