summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frei <freisim93@gmail.com>2021-03-17 09:06:37 +0100
committerGitHub <noreply@github.com>2021-03-17 09:06:37 +0100
commitcd21b8dfa55ba6017980f278033d21c1465cadaa (patch)
tree603a7d6d574cea77cca254fcf0e8cc70a7f05693
parent40fbdc87ce985e2edb349b616a361cc828ec99e1 (diff)
cmd/syncthing/cli: Remove db reset and adjust others (#7484)v1.15.0-rc.4
-rw-r--r--cmd/syncthing/cli/operations.go7
-rw-r--r--cmd/syncthing/cli/show.go2
2 files changed, 2 insertions, 7 deletions
diff --git a/cmd/syncthing/cli/operations.go b/cmd/syncthing/cli/operations.go
index ce1d4b79b0..5a8a062ce5 100644
--- a/cmd/syncthing/cli/operations.go
+++ b/cmd/syncthing/cli/operations.go
@@ -28,18 +28,13 @@ var operationCommand = cli.Command{
Action: expects(0, emptyPost("system/shutdown")),
},
{
- Name: "reset",
- Usage: "Reset syncthing deleting all folders and devices",
- Action: expects(0, emptyPost("system/reset")),
- },
- {
Name: "upgrade",
Usage: "Upgrade syncthing (if a newer version is available)",
Action: expects(0, emptyPost("system/upgrade")),
},
{
Name: "folder-override",
- Usage: "Override changes on folder (remote for sendonly, local for receiveonly)",
+ Usage: "Override changes on folder (remote for sendonly, local for receiveonly). WARNING: Destructive - deletes/changes your data.",
ArgsUsage: "[folder id]",
Action: expects(1, foldersOverride),
},
diff --git a/cmd/syncthing/cli/show.go b/cmd/syncthing/cli/show.go
index 1044124d38..7f0bdf2e43 100644
--- a/cmd/syncthing/cli/show.go
+++ b/cmd/syncthing/cli/show.go
@@ -23,7 +23,7 @@ var showCommand = cli.Command{
{
Name: "config-status",
Usage: "Show configuration status, whether or not a restart is required for changes to take effect",
- Action: expects(0, dumpOutput("system/config/insync")),
+ Action: expects(0, dumpOutput("config/restart-required")),
},
{
Name: "system",