From 25a8802403de157bdfc39b7860ea4e3ee2b1d8ee Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 9 Oct 2016 19:32:55 +0200
Subject: main: rename "-o" option to "-ko"

This prevents confusion with the "-o" options that is passed
by mount(1) at the end of the command line.
---
 cli_args.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cli_args.go')

diff --git a/cli_args.go b/cli_args.go
index d80e937..94363d0 100644
--- a/cli_args.go
+++ b/cli_args.go
@@ -16,7 +16,7 @@ type argContainer struct {
 	plaintextnames, quiet, nosyslog, wpanic,
 	longnames, allow_other, ro, reverse, aessiv, nonempty bool
 	masterkey, mountpoint, cipherdir, cpuprofile, extpass,
-	memprofile, o string
+	memprofile, ko string
 	// Configuration file name override
 	config             string
 	notifypid, scryptn int
@@ -61,7 +61,7 @@ func parseCliOpts() (args argContainer) {
 	flagSet.StringVar(&args.memprofile, "memprofile", "", "Write memory profile to specified file")
 	flagSet.StringVar(&args.config, "config", "", "Use specified config file instead of CIPHERDIR/gocryptfs.conf")
 	flagSet.StringVar(&args.extpass, "extpass", "", "Use external program for the password prompt")
-	flagSet.StringVar(&args.o, "o", "", "Pass additional mount options to the kernel, comma-separated list")
+	flagSet.StringVar(&args.ko, "ko", "", "Pass additional options directly to the kernel, comma-separated list")
 	flagSet.IntVar(&args.notifypid, "notifypid", 0, "Send USR1 to the specified process after "+
 		"successful mount - used internally for daemonization")
 	flagSet.IntVar(&args.scryptn, "scryptn", configfile.ScryptDefaultLogN, "scrypt cost parameter logN. "+
-- 
cgit v1.2.3