Commit 34d090c
committed
Merge remote-tracking branch 'origin/pr/711'
* origin/pr/711:
Fail early on missing necessary preload service
Pull request description:
Occurs when the global max preload feature, set on dom0, with the default-dispvm being an unsupported template, which can happen on old ISOs, old templates, downgraded templates or packages. When setting the dom0 feature or when switching the default-dispvm, there is no supported-rpc validation. Handle gracefully in case the qube is the default-dispvm and the global max feature is set.
Without this validation, it tries to preload and fails on startup check of the same supported-rpc, but this time, running it as a service.
For: QubesOS/qubes-issues#1512
Without it, doesn't break anything, but a minor annoyance of failing the `qubes-preload-dispvm.service` and `qubesd` logs and the preloads trying to start to just fail. This has more chance of happening with the global preload feature as it doesn't check if the default-dispvm supports the necessary RPC service.1 file changed
Lines changed: 16 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
128 | | - | |
| 127 | + | |
129 | 128 | | |
130 | 129 | | |
131 | 130 | | |
| |||
283 | 282 | | |
284 | 283 | | |
285 | 284 | | |
286 | | - | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
287 | 291 | | |
288 | 292 | | |
289 | 293 | | |
| |||
460 | 464 | | |
461 | 465 | | |
462 | 466 | | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
0 commit comments