From f8953c6acc82803fd00e2ef3e56a10e52a822e99 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Thu, 28 Dec 2023 12:26:37 +0100 Subject: [PATCH] doc: better usage of split-gpg2 in qubes-builder --- salt/qubes-builder/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/salt/qubes-builder/README.md b/salt/qubes-builder/README.md index ea38a7c..586fb3a 100644 --- a/salt/qubes-builder/README.md +++ b/salt/qubes-builder/README.md @@ -28,12 +28,6 @@ Qubes Executor lacking some dependencies on Debian such as builder qube was Debian based, the executor qube still needs to be a Fedora template. -A set of trusted keys is placed into the `qubes-builder` to be used to verify -the git repositories during this package installation. The split-gpg2 setup is -not used during installation as it can't restrict access to a certain set of -keys (GNUPGHOME) yet. Spit-gpg2 will be used for GPG operations transparently -when verifying and signing software, don't worry. - - Top ```sh qubesctl top.enable qubes-builder @@ -62,9 +56,9 @@ limit the scope, the action is `allowed`, else the action is to `ask`. ## Usage -The builder qube is named `qubes-builder.` +The builder qube is named `qubes-builder`. -When using the Qubes Executor, configure the builder.yml `dispvm` option to +When using the Qubes Executor, configure the `builder.yml` `dispvm` option to either `dom0` or `dvm-qubes-builder`: ```yaml executor: @@ -76,5 +70,11 @@ executor: Setting the Disposable VM to Dom0 works because it will use the `default_dispvm` preference of `qubes-builder`, which is `dvm-qubes-builder`. +If you need to pull new commits, a set of trusted keys is present in +`/home/user/.gnupg/qubes-builder` to be used to verify commits or tags: +```sh +GNUPGHOME="$HOME/.gnupg/qubes-builder" git verify-commit "HEAD^{commit}" +``` + There are no further modifications needed to comply with this package. Consult -upstream documentation on how to use the Qubes OS Builder. +upstream documentation on how to use the Qubes OS Builder V2.