Merge pull request #9 from modelrockettier/master

Add chacha20 and poly1305 modules to initramfs

diff --git a/bcachefs.c b/bcachefs.c
index 910e0b16fadfe44d63da2e55ecfd7c13044b6232..304a01bb0f418a963db22b9a801d3e3bbef86ad6 100644 (file)
--- 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);

diff --git a/initramfs/hook b/initramfs/hook
index aa91469ef10565d4753ecca52c9e8339e2f004b3..404a249911b8ec70d92ed02e0a2f45b739ca8589 100755 (executable)
--- 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[-_]*'
+