opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add rootful status to machine inspect

Browse Source 
Podman machine inspect now shows if the machine is rootful

Signed-off-by: Ashley Cui <acui@redhat.com>
This commit is contained in:
Ashley Cui
2023-08-17 01:39:56 -04:00
parent 4ff21cf1ac
commit da81bc13a1
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/source/markdown/podman-machine-inspect.1.md
View File

@ -24,7 +24,7 @@ Rootless only.
Print results with a Go template.
| **Placeholder** | **Description** |
| ------------------- | ----------------------------------------------------- |
| ------------------- | --------------------------------------------------------------------- |
| .ConfigPath ... | Machine configuration file location |
| .ConnectionInfo ... | Machine connection information |
| .Created | Machine creation time (string, ISO3601) |
@ -32,6 +32,7 @@ Print results with a Go template.
| .LastUp | Time when machine was last booted |
| .Name | Name of the machine |
| .Resources ... | Resources used by the machine |
| .Rootful | Whether the machine prefers rootful or rootless container execution |
| .SSHConfig ... | SSH configuration info for communitating with machine |
| .State ... | Machine state |
| .UserModeNetworking | Whether this machine uses user-mode networking |

1
pkg/machine/applehv/machine.go
View File

@ -317,6 +317,7 @@ func (m *MacMachine) Inspect() (*machine.InspectInfo, error) {
},
SSHConfig: m.SSHConfig,
State: vmState,
Rootful: m.Rootful,
}
return &ii, nil
}

1
pkg/machine/config.go
View File

@ -151,6 +151,7 @@ type InspectInfo struct {
SSHConfig SSHConfig
State Status
UserModeNetworking bool
Rootful bool
}
func (rc RemoteConnectionType) MakeSSHURL(host, path, port, userName string) url.URL {

1
pkg/machine/hyperv/machine.go
View File

@ -303,6 +303,7 @@ func (m *HyperVMachine) Inspect() (*machine.InspectInfo, error) {
},
SSHConfig: m.SSHConfig,
State: vm.State().String(),
Rootful: m.Rootful,
}, nil
}

1
pkg/machine/qemu/machine.go
View File

@ -1596,6 +1596,7 @@ func (v *MachineVM) Inspect() (*machine.InspectInfo, error) {
SSHConfig: v.SSHConfig,
State: state,
UserModeNetworking: true, // always true
Rootful: v.Rootful,
}, nil
}

1
pkg/machine/wsl/machine.go
View File

@ -1745,6 +1745,7 @@ func (v *MachineVM) Inspect() (*machine.InspectInfo, error) {
SSHConfig: v.SSHConfig,
State: state,
UserModeNetworking: v.UserModeNetworking,
Rootful: v.Rootful,
}, nil
}