Skip to content

Commit

Permalink
Remove the deprecated reset command
Browse files Browse the repository at this point in the history
The Go implementation had deprecated the reset command, right from the
beginning, in favour of 'podman system reset'. It's time to finally
remove it.

#668
  • Loading branch information
debarshiray committed Jan 12, 2021
1 parent 21d25f8 commit 120eea4
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 133 deletions.
2 changes: 1 addition & 1 deletion completion/bash/toolbox
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ __toolbox() {
local MIN_VERSION=32
local RAWHIDE_VERSION=34

local commands="create enter help init-container list reset rm rmi run"
local commands="create enter help init-container list rm rmi run"

declare -A options
local options=([create]="--container --distro --image --release" \
Expand Down
1 change: 0 additions & 1 deletion doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ manuals = [
'toolbox-init-container.1',
'toolbox-help.1',
'toolbox-list.1',
'toolbox-reset.1',
'toolbox-rm.1',
'toolbox-rmi.1',
'toolbox-run.1',
Expand Down
26 changes: 0 additions & 26 deletions doc/toolbox-reset.1.md

This file was deleted.

4 changes: 0 additions & 4 deletions doc/toolbox.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ Initialize a running container.

List existing toolbox containers and images.

**toolbox-reset(1)**

Remove all local podman (and toolbox) state.

**toolbox-rm(1)**

Remove one or more toolbox containers.
Expand Down
96 changes: 0 additions & 96 deletions src/cmd/reset.go

This file was deleted.

6 changes: 2 additions & 4 deletions src/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,8 @@ func preRun(cmd *cobra.Command, args []string) error {
toolboxPath = os.Getenv("TOOLBOX_PATH")
logrus.Debugf("TOOLBOX_PATH is %s", toolboxPath)

if cmd.Use != "reset" {
if err := migrate(); err != nil {
return err
}
if err := migrate(); err != nil {
return err
}

return nil
Expand Down
1 change: 0 additions & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ sources = files(
'cmd/help.go',
'cmd/initContainer.go',
'cmd/list.go',
'cmd/reset.go',
'cmd/rm.go',
'cmd/rmi.go',
'cmd/root.go',
Expand Down

0 comments on commit 120eea4

Please sign in to comment.