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

@ -58,19 +58,17 @@ There are two ways to upgrade your template to a new Debian release:
This section contains notes about specific Debian releases.
### Debian 10
### Debian 12
Debian 10 (buster) - minimal:
If you want to use a Debian 12 template for salting Qubes, you **must** stop the salt-common and salt-ssh packages from being upgraded.
Do this by marking these packages on hold *before* updating the template.
```
[user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-itl qubes-template-debian-10-minimal
```
Debian 10 (buster) - stable:
```
[user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-itl qubes-template-debian-10
sudo apt-mark hold salt-common salt-ssh
sudo apt update
sudo apt upgrade
```
This is a [known bug](https://github.com/QubesOS/qubes-issues/issues/9129) in Salt which affects version 3006-5.
### Starting services

View file

@ -170,7 +170,7 @@ installing a template package in dom0, per the instructions
dom0 in order to uninstall it:
```
$ sudo dnf remove qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>
$ qvm-template remove qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>
```
`qubes-template-<DISTRO_NAME>-<RELEASE_NUMBER>` is the name of the desired