diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 03:32:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 03:32:20 -0700 |
| commit | caf46abd3a4af1ff065400573f19e69109cbb647 (patch) | |
| tree | 38865f10301708992186073fe5923fd3afef57a3 /cmd | |
| parent | 171dd10125a4b4195409f05ea45fb505021f2ce8 (diff) | |
| parent | 1c6ae73a898222a14b98526339d9985c51f88d35 (diff) | |
| download | podman-caf46abd3a4af1ff065400573f19e69109cbb647.tar.gz podman-caf46abd3a4af1ff065400573f19e69109cbb647.tar.bz2 podman-caf46abd3a4af1ff065400573f19e69109cbb647.zip | |
Merge pull request #6101 from sujil02/systemreset-v2
Adds tunnel routes for system reset.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/system/reset.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 22ddc7529..6caa91690 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -26,10 +26,8 @@ var ( Long: systemResetDescription, Run: reset, } -) -var ( - systemResetOptions entities.SystemResetOptions + forceFlag bool ) func init() { @@ -39,12 +37,12 @@ func init() { Parent: systemCmd, }) flags := systemResetCommand.Flags() - flags.BoolVarP(&systemResetOptions.Force, "force", "f", false, "Do not prompt for confirmation") + flags.BoolVarP(&forceFlag, "force", "f", false, "Do not prompt for confirmation") } func reset(cmd *cobra.Command, args []string) { // Prompt for confirmation if --force is not set - if !systemResetOptions.Force { + if !forceFlag { reader := bufio.NewReader(os.Stdin) fmt.Print(` WARNING! This will remove: @@ -74,7 +72,7 @@ Are you sure you want to continue? [y/N] `) } defer engine.Shutdown(registry.Context()) - if err := engine.Reset(registry.Context(), systemResetOptions); err != nil { + if err := engine.Reset(registry.Context()); err != nil { fmt.Println(err) os.Exit(125) } |