From e3344483f45b783fb83ae12f075906a469b80d58 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 26 Jan 2024 08:02:55 -0600 Subject: [PATCH 1/2] docs: various tweaks from a first-time reader In step 1, since editing /etc is not desirable for rootless Podman, mention the alternative location that will have the same effect. In step 2, there's no need for the disclaimer paragraph about Docker lacking --latest in an example that already can't use Docker because of lack of --rootfs a couple paragraphs above. And even for Podman, make it clear that the initial example is limited, in that the qcow2 image has no ssh keys, root password, or alternative users installed yet. Signed-off-by: Eric Blake --- docs/1-installing.md | 7 ++++++- docs/2-podman-docker.md | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/1-installing.md b/docs/1-installing.md index e32ef14..679fba4 100644 --- a/docs/1-installing.md +++ b/docs/1-installing.md @@ -28,7 +28,12 @@ 5. If you're using Podman: - - Merge the following configuration into `/etc/containers/containers.conf`: + - Merge the following configuration into + `/etc/containers/containers.conf`: + + > For rootless Podman, you can instead use + > `${XDG_CONFIG_PATH}/containers/containers.conf`, where + > `$XDG_CONFIG_PATH` defaults to `${HOME}/.config`. ```toml [engine.runtimes] diff --git a/docs/2-podman-docker.md b/docs/2-podman-docker.md index 44bbc0b..4e724a8 100644 --- a/docs/2-podman-docker.md +++ b/docs/2-podman-docker.md @@ -32,14 +32,15 @@ $ podman run \ "" # unused, but must specify command ``` -The VM console should take over your terminal. To abort the VM, press `ctrl-]`. +The VM console should take over your terminal. At this point, the +qcow2 image does not have any ssh keys, root password, or alternative +users installed, so although you can interact with the VM's login +screen, you will be unable to access a command prompt until more +options are used in later sections. To abort the VM, press `ctrl-]`. You can also detach from the VM without terminating it by pressing `ctrl-p, ctrl-q`. Afterwards, reattach by running: -> For this command to work with Docker, you must replace the `--latest` flag -> with the container's name or ID. - ```console $ podman attach --latest ``` From 9a47b48f4713914a0350305c9797d351c99044a6 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 26 Jan 2024 09:20:34 -0600 Subject: [PATCH 2/2] maint: Ignore more build artifacts Between 'cargo build' and 'make', I ended up with bin/ and targets/ directories that don't need to be committed. Signed-off-by: Eric Blake --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ea8c4bf..cdded28 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /target +/bin/ +/targets/