Commit 6a66cf7
committed
ostree: allow --no-start-daemon and --init none
The ostree planner hard-coded InitSystem::Systemd and always started
the daemon, making it impossible to install Nix during container builds
where systemd is not running.
Add InitSettings to the Ostree planner, mirroring the Linux planner.
When init is None, /nix is created directly instead of relying on the
bind mount. Remove the unused OstreeError enum.
Add a Fedora 42 container test exercising the reported scenario.
Closes: #1551 parent 9d2319d commit 6a66cf7
File tree
4 files changed
+183
-152
lines changed- .github/workflows
- nix/tests/container-test
- ostree
- src/planner
4 files changed
+183
-152
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
313 | 313 | | |
314 | 314 | | |
315 | 315 | | |
| 316 | + | |
316 | 317 | | |
317 | 318 | | |
318 | 319 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
27 | 56 | | |
28 | 57 | | |
29 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
0 commit comments