fix luksFormat for newer initramfs-tools

2 files changed, 9 insertions, 4 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index 2ab2333..5cf7d01 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -13,7 +13,12 @@ PATH=/usr/local/lib/samizdat-rhizome/initrd:/usr/local/bin:$PATH
 
 repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
-path_execs='mountpoint openvt rsync gpg2 pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files samizdat-pinentry dynmenu samizdat-password-agent samizdat-gpg-agent parted'
+path_execs='
+    mountpoint openvt rsync gpg2 pinentry-curses truncate dmsetup
+    dmstats cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files
+    samizdat-pinentry dynmenu samizdat-password-agent samizdat-gpg-agent
+    parted fallocate strace
+'
 
 graft_paths="
     /bin/OpenVT=/bin/openvt
@@ -26,8 +31,8 @@ graft_paths="
 
 absolute_path_copies='/lib/terminfo/l/linux /usr/bin/gpg-agent'
 
-modules='loop xts dm-crypt hfs hfsplus'
-modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
+modules='loop dm-snapshot dm-crypt btrfs hfs hfsplus'
+modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls kernel/crypto'
 
 for f in $repo_execs; do CopyExec "$f" /bin; done
 for c in $path_execs; do
diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 6752ec8..f0cdf3f 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -292,7 +292,7 @@ init_samizdat_blockdev()
   luks_secret >/dev/null
   luks_secret | gpg2 --default-recipient-self --encrypt --armor | gpg2 --clearsign --output "$keyfile" || return
 
-  luks_secret | cryptsetup luksFormat "$dev" - || return
+  luks_secret | cryptsetup -v luksFormat "$dev" - || return
   cryptsetup luksDump "$dev" >&2
   luks_secret | cryptsetup --key-file - luksOpen "$dev" "$cryptname" || return