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

machine: Remove unnecessary TODOs

Browse Source 
Remove TODO to swap `Rootful` in Inspect with `HostUser`

It is unnecessary to remove the vfkit logfile in the provider-specific Remove function. Vfkit is fed the default logfile provided by mc.LogFile which is removed by the generic Remove function.

Removes TODO regarding moving the location of Stop. False TODO.

[NO NEW TESTS NEEDED]

Signed-off-by: Jake Correnti <jakecorrenti+github@proton.me>
This commit is contained in:
Jake Correnti
2024-02-18 22:24:43 -05:00
parent 6c7f987ab3
commit 66f39eee5e
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/machine/inspect.go
View File

@ -90,8 +90,7 @@ func inspect(cmd *cobra.Command, args []string) error {
SSHConfig: mc.SSH, SSHConfig: mc.SSH,
State: state, State: state,
UserModeNetworking: provider.UserModeNetworkEnabled(mc), UserModeNetworking: provider.UserModeNetworkEnabled(mc),
// TODO I think this should be the HostUser Rootful: mc.HostUser.Rootful,
Rootful: mc.HostUser.Rootful,
} }
vms = append(vms, ii) vms = append(vms, ii)

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

@ -21,7 +21,6 @@ func (a *AppleHVStubber) Remove(mc *vmconfigs.MachineConfig) ([]string, func() e
mc.Lock() mc.Lock()
defer mc.Unlock() defer mc.Unlock()
// TODO we could delete the vfkit pid/log files if we wanted to be thorough
return []string{}, func() error { return nil }, nil return []string{}, func() error { return nil }, nil
} }

1
pkg/machine/shim/host.go
View File

@ -306,7 +306,6 @@ func getMCsOverProviders(vmstubbers []vmconfigs.VMProvider) (map[string]*vmconfi
} }
// Stop stops the machine as well as supporting binaries/processes // Stop stops the machine as well as supporting binaries/processes
// TODO: I think this probably needs to go somewhere that remove can call it.
func Stop(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *machineDefine.MachineDirs, hardStop bool) error { func Stop(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *machineDefine.MachineDirs, hardStop bool) error {
// state is checked here instead of earlier because stopping a stopped vm is not considered // state is checked here instead of earlier because stopping a stopped vm is not considered
// an error. so putting in one place instead of sprinkling all over. // an error. so putting in one place instead of sprinkling all over.