From 31bc8c843e1862b2d28f31eff85eca3d1dbd4754 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 9 May 2020 14:04:47 -0700 Subject: cmd/fscrypt: add FSCRYPT_CONF environmental variable Allow overriding the location of fscrypt.conf by setting the FSCRYPT_CONF environmental variable. The CLI tests need this to avoid touching the real /etc/fscrypt.conf. --- cmd/fscrypt/fscrypt.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cmd') diff --git a/cmd/fscrypt/fscrypt.go b/cmd/fscrypt/fscrypt.go index e260f7f..069cc96 100644 --- a/cmd/fscrypt/fscrypt.go +++ b/cmd/fscrypt/fscrypt.go @@ -31,6 +31,8 @@ import ( "os" "github.com/urfave/cli" + + "github.com/google/fscrypt/actions" ) // Current version of the program (set by Makefile) @@ -41,6 +43,10 @@ func main() { cli.CommandHelpTemplate = commandHelpTemplate cli.SubcommandHelpTemplate = subcommandHelpTemplate + if conffile := os.Getenv("FSCRYPT_CONF"); conffile != "" { + actions.ConfigFileLocation = conffile + } + // Create our command line application app := cli.NewApp() app.Usage = shortUsage -- cgit v1.2.3