diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-30 14:44:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 14:44:43 +0000 |
| commit | 85bad0cc7c68b71ab7ddb6ed09b862145c6c6d0e (patch) | |
| tree | 02781f69a14b72578f1f6666c0398c812ea3da48 /docs | |
| parent | 7cd317e9c35aa9f4776ee491bdd943c6e2ce55d3 (diff) | |
| parent | 3c79202fb9d35e732b655a1fb99a490b813b50a4 (diff) | |
| download | podman-85bad0cc7c68b71ab7ddb6ed09b862145c6c6d0e.tar.gz podman-85bad0cc7c68b71ab7ddb6ed09b862145c6c6d0e.tar.bz2 podman-85bad0cc7c68b71ab7ddb6ed09b862145c6c6d0e.zip | |
Merge pull request #12119 from ashley-cui/updates
[CI:DOCS] Add information on how podman machine is updated
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-machine-init.1.md | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-machine-ssh.1.md | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-machine-init.1.md b/docs/source/markdown/podman-machine-init.1.md index f1fbd56ee..45f798cd6 100644 --- a/docs/source/markdown/podman-machine-init.1.md +++ b/docs/source/markdown/podman-machine-init.1.md @@ -18,6 +18,10 @@ tied to the Linux kernel. SSH keys are automatically generated to access the VM, and system connections to the root account and a user account inside the VM are added. +By default, the VM distribution is [Fedora CoreOS](https://getfedora.org/en/coreos?stream=testing). +Fedora CoreOS upgrades come out every 14 days and are detected and installed automatically. The VM will be rebooted during the upgrade. +For more information on updates and advanced configuration, please see the FCOS update docs [here](https://docs.fedoraproject.org/en-US/fedora-coreos/auto-updates/) and [here](https://coreos.github.io/zincati/usage/updates-strategy/). + ## OPTIONS #### **--cpus**=*number* diff --git a/docs/source/markdown/podman-machine-ssh.1.md b/docs/source/markdown/podman-machine-ssh.1.md index c4c732819..dd592622f 100644 --- a/docs/source/markdown/podman-machine-ssh.1.md +++ b/docs/source/markdown/podman-machine-ssh.1.md @@ -9,7 +9,7 @@ podman\-machine\-ssh - SSH into a virtual machine ## DESCRIPTION SSH into a Podman-managed virtual machine and optionally execute a command -on the virtual machine. Unless using the default virtual machine, the +on the virtual machine. Unless using the default virtual machine, the first argument must be the virtual machine name. The optional command to execute can then follow. If no command is provided, an interactive session with the virtual machine is established. |