Merge branch 'QubesOS:main' into main

This commit is contained in:
m 2024-07-28 18:10:10 -04:00 committed by GitHub
commit 5941ae92ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 68 additions and 20 deletions

View file

@ -224,7 +224,7 @@ Kernel for a VM is stored in `/var/lib/qubes/vm-kernels/KERNEL_VERSION` director
* `modules.img` - ext4 filesystem image containing Linux kernel modules (to be mounted at `/lib/modules`); additionally it should contain a copy of `vmlinuz` and `initramfs` in its root directory (for loading by qemu inside stubdomain)
* `default-kernelopts-common.txt` - default kernel options, in addition to those specified with `kernelopts` qube property (can be disabled with `no-default-kernelopts` feature)
All the files besides `vmlinuz` and `initramfs` are optional in Qubes R4.0 or newer.
All the files besides `vmlinuz` are optional in Qubes R4.2 or newer.
## Using kernel installed in the VM
@ -279,7 +279,9 @@ Then shutdown the VM.
* You may also use `PV` mode instead of `HVM` but this is not recommended for security purposes.
* If you require `PV` mode, install `grub2-xen-pvh` in dom0 and change the template's kernel to `pvgrub2-pvh`.
* Booting to a kernel inside the template is not supported under `PVH`.
* If you require `PVH` mode, install `grub2-xen-pvh` in dom0 and change the kernel to `pvgrub2-pvh`.
* To install `grub2-xen-pvh` run the command `sudo qubes-dom0-update pvgrub2-pvh` in dom0.
### Installing kernel in Debian VM
@ -314,7 +316,7 @@ Depends on `Virtualization` mode setting:
* `Virtualization` mode `PV`: Possible, however use of `Virtualization` mode `PV` mode is discouraged for security purposes.
* If you require `Virtualization` mode `PV` mode, install `grub2-xen-pvh` in dom0. This can be done by running command `sudo qubes-dom0-update pvgrub2-pvh` in dom0.
* `Virtualization` mode `PVH`: Possible.
* `Virtualization` mode `PVH`: Possible. Install `grub2-xen-pvh` in dom0.
* `Virtualization` mode `HVM`: Possible.
The `Kernel` setting of the `Virtualization` mode setting:

View file

@ -555,6 +555,17 @@ Additional pillar data is available to ease targeting configurations (for exampl
**Note:** This list is subject to change in future releases.
### `qubes:features`
Features the qube has. Only some values are included:
- `service.*` - services enabled or disabled in the qube
- `vm-config.*` - features also exposed to qubesdb
### `qubes:tags`
Tags the qube has.
### `qubes:type`
qube type. Possible values: