summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinitramfs-tools/hooks/samizdat11
-rw-r--r--src/initrd/btrfs-create.sh2
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
13 13
14repo_execs=$(echo "${samizdat_initrd_files_dir}"/*) 14repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
15 15
16path_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' 16path_execs='
17 mountpoint openvt rsync gpg2 pinentry-curses truncate dmsetup
18 dmstats cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files
19 samizdat-pinentry dynmenu samizdat-password-agent samizdat-gpg-agent
20 parted fallocate strace
21'
17 22
18graft_paths=" 23graft_paths="
19 /bin/OpenVT=/bin/openvt 24 /bin/OpenVT=/bin/openvt
@@ -26,8 +31,8 @@ graft_paths="
26 31
27absolute_path_copies='/lib/terminfo/l/linux /usr/bin/gpg-agent' 32absolute_path_copies='/lib/terminfo/l/linux /usr/bin/gpg-agent'
28 33
29modules='loop xts dm-crypt hfs hfsplus' 34modules='loop dm-snapshot dm-crypt btrfs hfs hfsplus'
30modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls' 35modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls kernel/crypto'
31 36
32for f in $repo_execs; do CopyExec "$f" /bin; done 37for f in $repo_execs; do CopyExec "$f" /bin; done
33for c in $path_execs; do 38for 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()
292 luks_secret >/dev/null 292 luks_secret >/dev/null
293 luks_secret | gpg2 --default-recipient-self --encrypt --armor | gpg2 --clearsign --output "$keyfile" || return 293 luks_secret | gpg2 --default-recipient-self --encrypt --armor | gpg2 --clearsign --output "$keyfile" || return
294 294
295 luks_secret | cryptsetup luksFormat "$dev" - || return 295 luks_secret | cryptsetup -v luksFormat "$dev" - || return
296 cryptsetup luksDump "$dev" >&2 296 cryptsetup luksDump "$dev" >&2
297 luks_secret | cryptsetup --key-file - luksOpen "$dev" "$cryptname" || return 297 luks_secret | cryptsetup --key-file - luksOpen "$dev" "$cryptname" || return
298 298