From 6bc8b6a8d213f8a3406684e9d99a3f106d64494f Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Wed, 12 Jul 2023 14:44:47 -0500 Subject: [PATCH] Update the live/README and provisioning-stacker.yaml Closes #48 Add a few missing instructions. Make sure the ROOTFS_VERSION is set. Download a newer mosctl binary. Signed-off-by: Serge Hallyn --- live/README.md | 12 ++++++++++-- live/provision-stacker.yaml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/live/README.md b/live/README.md index 324f582..30f24dc 100644 --- a/live/README.md +++ b/live/README.md @@ -1,5 +1,6 @@ # Building live cd + * Ensure you have installed all of the build requirements for mos, trust, and bootkit. (See the .github/workflows/build.yml files in each) * Create bootkit artifacts under .local/share/machine/trust/keys/$keyset - should be done by 'trust keyset add' @@ -7,17 +8,24 @@ git clone https://github.com/hallyn/bootkit cd bootkit make build - umoci unpack --image ../build-bootkit/oci:bootkit \ + umoci unpack --rootless --image \ + ../build-bootkit/oci:bootkit xxx + mv xxx/rootfs/bootkit ~/.local/share/machine/trust/keys/snakeoil/ + rm -rf xxx ``` NOTE - we want to move that from the project into the keyset. + * pin rootfs version to use + ``` + export ROOTFS_VERSION=0.0.5.230327-squashfs + ``` * cd live * build the rootfs ``` stacker build --layer-type=squashfs \ - --substitute ROOTFS_VERSION=0.0.5.230327-squashfs + --substitute ROOTFS_VERSION="${ROOTFS_VERSION}" ``` * Note: I seem to be hitting a bug with this, where it fails to build the second time. diff --git a/live/provision-stacker.yaml b/live/provision-stacker.yaml index f6bf4ee..1c1c8d3 100644 --- a/live/provision-stacker.yaml +++ b/live/provision-stacker.yaml @@ -18,7 +18,7 @@ provision-rootfs: type: built tag: provision-rootfs-pkg import: - - https://github.com/project-machine/mos/releases/download/0.0.9/mosctl + - https://github.com/project-machine/mos/releases/download/0.0.11/mosctl - trust-provision - trust-provision.service - trust-provision-failed.service