From 6c7934ee8034c2130cfeb14d67d64a6a4ecb2382 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 12 Feb 2021 12:13:53 +0100
Subject: [PATCH 1/2] remove ocis config file option

---
 ocis/pkg/config/config.go   | 1 -
 ocis/pkg/flagset/flagset.go | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/ocis/pkg/config/config.go b/ocis/pkg/config/config.go
index ca7d907ae9..6de2403d7d 100644
--- a/ocis/pkg/config/config.go
+++ b/ocis/pkg/config/config.go
@@ -61,7 +61,6 @@ type TokenManager struct {
 
 // Config combines all available configuration parts.
 type Config struct {
-	File         string
 	Registry     string
 	Log          Log
 	Debug        Debug
diff --git a/ocis/pkg/flagset/flagset.go b/ocis/pkg/flagset/flagset.go
index 8daa92c78d..554850ab5c 100644
--- a/ocis/pkg/flagset/flagset.go
+++ b/ocis/pkg/flagset/flagset.go
@@ -8,13 +8,6 @@ import (
 // RootWithConfig applies cfg to the root flagset
 func RootWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "config-file",
-			Value:       "",
-			Usage:       "Path to config file",
-			EnvVars:     []string{"OCIS_CONFIG_FILE"},
-			Destination: &cfg.File,
-		},
 		&cli.StringFlag{
 			Name:        "log-level",
 			Value:       "info",

From 29eda7f644543200a95509a848fd466b8e62fdaa Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 12 Feb 2021 12:21:56 +0100
Subject: [PATCH 2/2] add changelog

---
 changelog/unreleased/ocis_config_file_option.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog/unreleased/ocis_config_file_option.md

diff --git a/changelog/unreleased/ocis_config_file_option.md b/changelog/unreleased/ocis_config_file_option.md
new file mode 100644
index 0000000000..559319f10c
--- /dev/null
+++ b/changelog/unreleased/ocis_config_file_option.md
@@ -0,0 +1,3 @@
+Bugfix: Remove unimplemented config file option for oCIS root command
+
+https://github.com/owncloud/ocis/pull/1636