Commit 293293b
committed
Merge origin/main into chore/get-a-vm-running
origin/main (#32) refactored Hyper.Config into Hyper.Cfg.* modules
(Cfg.Tools/Jails/Dirs/Budget/Otel/Toml/...) and deleted config.ex. This
branch had independent VM-boot work on the same files. Resolution:
- config.ex: accept main's deletion; rewrite all Hyper.Config.X callers to
the Hyper.Cfg.{Tools,Jails,Dirs,Img}.Y equivalents (jailer, node, reclaim,
dmsetup).
- suid_helper/{blockdev,dmsetup,losetup}, jailer: keep THIS branch's
helper-routed architecture (no --bin; the merged Rust helper reads tool
paths from config and owns the privileged jailer flags).
- node.ex: keep check_firecracker_bins + dropped FireVMM.Provider (branch),
but load budget via Hyper.Cfg.Budget (main).
- fire_vmm/provider.ex: stays deleted (branch dropped Provider).
- umoci.ex, runtime.exs, config.md: take main (already carry these features,
refactored; config.md is main's comprehensive restructure).
- jailer_test: stub via Hyper.Cfg.Toml.put_cache/reload.
Gate green: compile --warnings-as-errors, format, 250 tests, dialyzer 0.59 files changed
Lines changed: 1511 additions & 810 deletions
File tree
- config
- docs/cookbook
- lib
- hyper
- cfg
- img
- img
- db
- gc
- oci_loader
- node
- budget
- fire_vmm
- vm_linux
- img
- layer
- suid_helper
- sys/mon
- unit
- test
- hyper
- cfg
- img
- node/fire_vmm
- vm_linux
- unit
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
27 | | - | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | 15 | | |
43 | 16 | | |
44 | 17 | | |
45 | | - | |
| 18 | + | |
46 | 19 | | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
47 | 24 | | |
48 | 25 | | |
49 | 26 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
54 | 37 | | |
| 38 | + | |
| 39 | + | |
55 | 40 | | |
0 commit comments