Skip to content

Commit 44f7465

Browse files
chriverschrivers
committed
Merge branch 'chrivers/book-improvements'
2 parents 28066bb + 235cece commit 44f7465

File tree

7 files changed

+46
-41
lines changed

7 files changed

+46
-41
lines changed

‎book/src/builders/deblive.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ in, and the first input will be the default boot option.
3131

3232
## Compatibility
3333

34-
| Target | Compatible? |
35-
|:-----------------------------|:------------|
36-
| Container: `systemd-nspawn` | ❌ |
37-
| Container: `docker` | ❌ |
38-
| Container: `podman` | ❌ |
39-
| Virtual Machine (UEFI) | ✅ |
40-
| Virtual Machine (BIOS) | ✅ |
41-
| Physical Machine (UEFI) | ✅ |
42-
| Physical Machine (BIOS) | ✅ |
34+
| Target | Compatible? |
35+
|:----------------------------|:------------|
36+
| Container: `systemd-nspawn` | ❌ |
37+
| Container: `portablectl` | ❌ |
38+
| Container: `docker` | ❌ |
39+
| Container: `podman` | ❌ |
40+
| Virtual Machine (UEFI) | ✅ |
41+
| Virtual Machine (BIOS) | ✅ |
42+
| Physical Machine (UEFI) | ✅ |
43+
| Physical Machine (BIOS) | ✅ |
4344

4445
Debian liveboot ISOs are widely compatible with both physical and virtual
4546
machines, including UEFI and BIOS-based platforms.

‎book/src/builders/disk-image.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77

88
## Compatibility
99

10-
| Target | Compatible? |
11-
|:-----------------------------|:--------------------|
12-
| Container: `systemd-nspawn` | ✅ (`raw`) |
13-
| Container: `docker` | ❌ |
14-
| Container: `podman` | ❌ |
15-
| Virtual Machine (UEFI) | ✅ (`raw`, `qcow2`) |
16-
| Virtual Machine (BIOS) | ❌ |
17-
| Physical Machine (UEFI) | ✅ (`raw`) |
18-
| Physical Machine (BIOS) | ❌ |
10+
| Target | Compatible? |
11+
|:----------------------------|:--------------------|
12+
| Container: `systemd-nspawn` | ✅ (`raw`) |
13+
| Container: `portablectl` | ✅ (`raw`) |
14+
| Container: `docker` | ❌ |
15+
| Container: `podman` | ❌ |
16+
| Virtual Machine (UEFI) | ✅ (`raw`, `qcow2`) |
17+
| Virtual Machine (BIOS) | ❌ |
18+
| Physical Machine (UEFI) | ✅ (`raw`) |
19+
| Physical Machine (BIOS) | ❌ |
1920

2021
This builder generates disk images, including a partition table, and separate
2122
partitions for `/`, `/boot` and `/boot/efi`.

‎book/src/builders/docker-image.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ shared when converted to Docker images.
1717
| Target | Compatible? |
1818
|:----------------------------|:------------|
1919
| Container: `systemd-nspawn` | ❌ |
20+
| Container: `portablectl` | ❌ |
2021
| Container: `docker` | ✅ |
2122
| Container: `podman` | ✅ |
2223
| Virtual Machine (UEFI) | ❌ |

‎book/src/builders/index.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ support this, in the future.
6060

6161
Containers:
6262

63-
| Builder | Format | `systemd-nspawn` | `docker` | `podman` |
64-
|:------------------|---------|:-----------------|:---------|----------|
65-
| `deblive` | `iso` | ❌ | ❌ | ❌ |
66-
| `live-disk-image` | `qcow2` | ❌ | ❌ | ❌ |
67-
| `disk-image` | `qcow2` | ❌ | ❌ | ❌ |
68-
| `live-disk-image` | `raw` | ❌ | ❌ | ❌ |
69-
| `disk-image` | `raw` | ✅ | ❌ | ❌ |
70-
| `part-image` | `raw` | ✅ | ❌ | ❌ |
71-
| `docker-image` | `tar` | ❌ | ✅ | ✅ |
63+
| Builder | Format | `systemd-nspawn` | `portablectl` | `docker` | `podman` |
64+
|:------------------|---------|:-----------------|:--------------|:---------|----------|
65+
| `deblive` | `iso` | ❌ | ❌ | ❌ | ❌ |
66+
| `live-disk-image` | `qcow2` | ❌ | ❌ | ❌ | ❌ |
67+
| `disk-image` | `qcow2` | ❌ | ❌ | ❌ | ❌ |
68+
| `live-disk-image` | `raw` | ❌ | ❌ | ❌ | ❌ |
69+
| `disk-image` | `raw` | ✅ | ✅ | ❌ | ❌ |
70+
| `part-image` | `raw` | ✅ | ✅ | ❌ | ❌ |
71+
| `docker-image` | `tar` | ❌ | ❌ | ✅ | ✅ |

‎book/src/builders/live-disk-image.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ prerequisite packages are installed.
1818
| Target | Compatible? |
1919
|:----------------------------|:--------------------|
2020
| Container: `systemd-nspawn` | ❌ |
21+
| Container: `portablectl` | ❌ |
2122
| Container: `docker` | ❌ |
2223
| Container: `podman` | ❌ |
2324
| Virtual Machine (UEFI) | ✅ (`raw`, `qcow2`) |

‎book/src/builders/part-image.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77

88
## Compatibility
99

10-
| Target | Compatible? |
11-
|:-----------------------------|:------------|
12-
| Container: `systemd-nspawn` | ✅ |
13-
| Container: `docker` | ❌ |
14-
| Container: `podman` | ❌ |
15-
| Virtual Machine (UEFI) | ❌ |
16-
| Virtual Machine (BIOS) | ❌ |
17-
| Physical Machine (UEFI) | ❌ |
18-
| Physical Machine (BIOS) | ❌ |
10+
| Target | Compatible? |
11+
|:----------------------------|:------------|
12+
| Container: `systemd-nspawn` | ✅ |
13+
| Container: `portablectl` | ✅ |
14+
| Container: `docker` | ❌ |
15+
| Container: `podman` | ❌ |
16+
| Virtual Machine (UEFI) | ❌ |
17+
| Virtual Machine (BIOS) | ❌ |
18+
| Physical Machine (UEFI) | ❌ |
19+
| Physical Machine (BIOS) | ❌ |
1920

2021
This builder generates partition images, containing a single filesystem.
2122

‎book/src/module-name.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ This is the case both for the `FROM` instruction (where the modules have the
88

99
There are three types of module names; Relative, Absolute and Package names.
1010

11-
| Type | Example | Description |
12-
|:---------|:------------|-------------------------------------------------------------|
13-
| Relative | `foo.bar` | Used to refer to paths at or below the current directory |
14-
| Absolute | `$.foo.bar` | Used to refer to paths from the root of the current package |
15-
| Package | `$foo.bar` | Used to refer to paths in other packages |
11+
| Type | Example | Description |
12+
|:---------|:------------|---------------------------------------------------------------|
13+
| Relative | `foo.bar` | Used to refer to paths *at or below* the current directory |
14+
| Absolute | `$.foo.bar` | Used to refer to paths *from the root* of the current package |
15+
| Package | `$foo.bar` | Used to refer to paths *in other packages* |
1616

1717
The difference between these forms is how they resolve to paths in the
1818
filesystem. For a detailed explanation of each, see the following sections.

0 commit comments

Comments
 (0)