Repository navigation
Commit 75c8eb5
committed
fix(site-router): drop the pki config-version entry, and make the appliance say why a config was rejected
Two things, and the second exists because of how the first was found.
The version entry goes. site-router's config.boot declared `pki@1` alongside
the component versions copied verbatim from the image, which did not carry a
pki entry at all. A config declaring a component version the system does not
have is the shape VyOS rejects, and remote site B is the control: its config
has no pki entry and no pki block, and it loads on the same image while A
does not. The entry bought nothing either way, since pki's only migration
returns immediately without `pki ca`.
That is a hypothesis, not a measurement, which is the problem. A rejected
config.boot reaches the console as one line, "Configuration error", and the
reason stays in /var/log/vyatta/vyos-config.log inside a guest with no SSH
service, a locked login and now a password-protected bootloader. The bring-up
emitter cannot cover it either: cron installs it from the configuration that
just failed to load, so the diagnostics need the thing that broke.
So the appliance now prints the tail of that log to the console after
vyos-router has run, whatever the outcome. A few lines on a good boot, the
whole answer on a bad one, collected by logSerialConsole and the e2e report
like everything else on that console. Had it been there, this round would
have named the offending line instead of narrowing to it.
An earlier reading of the boot output claimed the migration had succeeded and
the commit had failed, on the strength of the progress line "migrate system
configure". That does not follow: vyos-router runs migrate_bootfile with
`|| overall_status=1` and carries on regardless, and the word "system" comes
from the subinit loop rather than from system_activate. The migration step is
back in scope, which is what put the version entry back under suspicion.
Assisted-By: LLM
Signed-off-by: Myasnikov Daniil <[email protected]>1 parent 3b5a0d6 commit 75c8eb5
4 files changed
Lines changed: 58 additions & 1 deletion
File tree
- packages
- apps/site-router/templates
- system/vyos-router-image
- hack
- overlay
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
561 | 561 | | |
562 | 562 | | |
563 | 563 | | |
564 | | - | |
| 564 | + | |
565 | 565 | | |
566 | 566 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
81 | 91 | | |
82 | 92 | | |
83 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
0 commit comments