From f05f2e89a690987c9f8524a4ab85584877f1f702 Mon Sep 17 00:00:00 2001 From: Tim Schlueter Date: Thu, 23 Aug 2018 21:40:25 -0700 Subject: [PATCH 1/2] Don't display an error on --help --- bcachefs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bcachefs.c b/bcachefs.c index 910e0b16..304a01bb 100644 --- a/bcachefs.c +++ b/bcachefs.c @@ -194,6 +194,11 @@ int main(int argc, char *argv[]) if (!strcmp(cmd, "list")) return cmd_list(argc, argv); + if (!strcmp(cmd, "--help")) { + usage(); + return 0; + } + printf("Unknown command %s\n", cmd); usage(); exit(EXIT_FAILURE); From b4cc119f666afdd0558b40bf508de85956507bf5 Mon Sep 17 00:00:00 2001 From: Tim Schlueter Date: Thu, 23 Aug 2018 21:42:44 -0700 Subject: [PATCH 2/2] Make sure initramfs-tools adds chacha20 and poly1305 if loaded --- initramfs/hook | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/initramfs/hook b/initramfs/hook index aa91469e..404a2499 100755 --- a/initramfs/hook +++ b/initramfs/hook @@ -16,3 +16,9 @@ esac . /usr/share/initramfs-tools/hook-functions +manual_add_modules 'bcachefs' + +# chacha20 and poly1305 are used for encrypted bcachefs filesystems. +add_loaded_modules 'chacha20[-_]*' +add_loaded_modules 'poly1305[-_]*' +