aboutsummaryrefslogtreecommitdiff
path: root/cli-tests/t_setup.out
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2020-05-09 15:27:24 -0700
committerGitHub <noreply@github.com>2020-05-09 15:27:24 -0700
commitd4d28232d32bfb3f4827fcb79bd5043e1932ae66 (patch)
treedda5a65b2d8c157e03d3d35f3442547dafd51e4c /cli-tests/t_setup.out
parent1cdefc21b8b07aad7aafeefd05d3124cf93b9216 (diff)
parent181600d6327ed34a3f62eda0dd03a6d2ae49e5f9 (diff)
Merge pull request #219 from ebiggers/improve-errors
Improve error messages and suggestions
Diffstat (limited to 'cli-tests/t_setup.out')
-rw-r--r--cli-tests/t_setup.out16
1 files changed, 8 insertions, 8 deletions
diff --git a/cli-tests/t_setup.out b/cli-tests/t_setup.out
index e1606ba..943a781 100644
--- a/cli-tests/t_setup.out
+++ b/cli-tests/t_setup.out
@@ -26,7 +26,7 @@ Skipping creating MNT_ROOT/.fscrypt because it already exists.
# fscrypt setup --quiet when fscrypt.conf already exists
[ERROR] fscrypt setup: operation would be destructive
-Use --force to automatically run destructive operations.
+If desired, use --force to automatically run destructive operations.
# fscrypt setup --quiet --force when fscrypt.conf already exists
@@ -34,16 +34,16 @@ Use --force to automatically run destructive operations.
Metadata directories created at "MNT/.fscrypt".
# fscrypt setup filesystem (already set up)
-[ERROR] fscrypt setup: filesystem MNT: already setup for use
- with fscrypt
+[ERROR] fscrypt setup: filesystem MNT is already setup for
+ use with fscrypt
# no config file
-[ERROR] fscrypt setup: global config file does not exist
+[ERROR] fscrypt setup: "FSCRYPT_CONF" doesn't exist
-Run "sudo fscrypt setup" to create the file.
+Run "sudo fscrypt setup" to create this file.
# bad config file
-[ERROR] fscrypt setup: invalid character 'b' looking for beginning of value:
- global config file has invalid data
+[ERROR] fscrypt setup: "FSCRYPT_CONF" is invalid: invalid
+ character 'b' looking for beginning of value
-Run "sudo fscrypt setup" to recreate the file.
+Either fix this file manually, or run "sudo fscrypt setup" to recreate it.