Skip to content

Commit

Permalink
Merge pull request #24242 from rhatdan/krunkit
Browse files Browse the repository at this point in the history
Mention containers.conf settings for podman machine commands
openshift-merge-bot[bot] authored Oct 15, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents cc21548 + 3a4c446 commit 40dae5e
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion docs/source/markdown/podman-machine-init.1.md.in
Original file line number Diff line number Diff line change
@@ -52,6 +52,8 @@ Fedora CoreOS upgrades come out every 14 days and are detected and installed aut
For more information on updates and advanced configuration,
see the Fedora CoreOS documentation about [auto-updates](https://docs.fedoraproject.org/en-US/fedora-coreos/auto-updates/) and [update strategies](https://coreos.github.io/zincati/usage/updates-strategy/).

Default Podman machine settings can be set via the [machine] section in the containers.conf(5) file.

## OPTIONS

#### **--cpus**=*number*
@@ -208,7 +210,7 @@ $ podman machine init --usb bus=1,devnum=3
```

## SEE ALSO
**[podman(1)](podman.1.md)**, **[podman-machine(1)](podman-machine.1.md)**
**[podman(1)](podman.1.md)**, **[podman-machine(1)](podman-machine.1.md)**, **containers.conf(5)**

## HISTORY
March 2021, Originally compiled by Ashley Cui <acui@redhat.com>
4 changes: 3 additions & 1 deletion docs/source/markdown/podman-machine-set.1.md.in
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ then the settings will be applied to `podman-machine-default`.

Rootless only.

Default Podman machine settings can be set via the [machine] section in the containers.conf(5) file.

## OPTIONS

#### **--cpus**=*number*
@@ -93,7 +95,7 @@ $ podman machine set --rootful myvm
```

## SEE ALSO
**[podman(1)](podman.1.md)**, **[podman-machine(1)](podman-machine.1.md)**
**[podman(1)](podman.1.md)**, **[podman-machine(1)](podman-machine.1.md)**, **containers.conf(5)**

## HISTORY
February 2022, Originally compiled by Jason Greene <jason.greene@redhat.com>
4 changes: 3 additions & 1 deletion docs/source/markdown/podman-machine.1.md
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@ NOTE: The podman-machine configuration file is managed under the
`$XDG_CONFIG_HOME/containers/podman/machine/` directory. Changing the `$XDG_CONFIG_HOME`
environment variable while the machines are running can lead to unexpected behavior.

Podman machine behaviour can be modified via the [machine] section in the containers.conf(5) file.

## SUBCOMMANDS

| Command | Man Page | Description |
@@ -37,7 +39,7 @@ environment variable while the machines are running can lead to unexpected behav
| stop | [podman-machine-stop(1)](podman-machine-stop.1.md) | Stop a virtual machine |

## SEE ALSO
**[podman(1)](podman.1.md)**, **[podman-machine-info(1)](podman-machine-info.1.md)**, **[podman-machine-init(1)](podman-machine-init.1.md)**, **[podman-machine-list(1)](podman-machine-list.1.md)**, **[podman-machine-os(1)](podman-machine-os.1.md)**, **[podman-machine-rm(1)](podman-machine-rm.1.md)**, **[podman-machine-ssh(1)](podman-machine-ssh.1.md)**, **[podman-machine-start(1)](podman-machine-start.1.md)**, **[podman-machine-stop(1)](podman-machine-stop.1.md)**, **[podman-machine-inspect(1)](podman-machine-inspect.1.md)**, **[podman-machine-reset(1)](podman-machine-reset.1.md)**
**[podman(1)](podman.1.md)**, **[podman-machine-info(1)](podman-machine-info.1.md)**, **[podman-machine-init(1)](podman-machine-init.1.md)**, **[podman-machine-list(1)](podman-machine-list.1.md)**, **[podman-machine-os(1)](podman-machine-os.1.md)**, **[podman-machine-rm(1)](podman-machine-rm.1.md)**, **[podman-machine-ssh(1)](podman-machine-ssh.1.md)**, **[podman-machine-start(1)](podman-machine-start.1.md)**, **[podman-machine-stop(1)](podman-machine-stop.1.md)**, **[podman-machine-inspect(1)](podman-machine-inspect.1.md)**, **[podman-machine-reset(1)](podman-machine-reset.1.md)**, **containers.conf(5)**

### Troubleshooting

1 comment on commit 40dae5e

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.