summaryrefslogtreecommitdiff
path: root/src/initrd
diff options
context:
space:
mode:
Diffstat (limited to 'src/initrd')
-rw-r--r--src/initrd/btrfs-create.sh2
-rwxr-xr-xsrc/initrd/grok-block6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 6a6a94e..c13d981 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -120,7 +120,7 @@ initialize_root_filesystem()
120 rmdir /root/home 120 rmdir /root/home
121 btrfs subvolume create /root/home || return 121 btrfs subvolume create /root/home || return
122 122
123 copy_execs sbin mdadm dmsetup cryptsetup 123 copy_execs sbin mdadm dmsetup cryptsetup fsck.hfsplus
124 copy_execs bin btrfs rsync gpg gpg2 gpg-agent 124 copy_execs bin btrfs rsync gpg gpg2 gpg-agent
125 125
126 # Copy these over unconditionally, because they ought to remain in sync with 126 # Copy these over unconditionally, because they ought to remain in sync with
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 4978a92..081238a 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -184,6 +184,12 @@ then
184 mkdir -p /cdrom 184 mkdir -p /cdrom
185 . mdadm-dup.sh 185 . mdadm-dup.sh
186 dup_mount_cdrom "$DEVNAME" /cdrom && bootdone samizdat-cdrom 186 dup_mount_cdrom "$DEVNAME" /cdrom && bootdone samizdat-cdrom
187 if [ -e /cdrom/gnupghome ]; then
188 # TODO: don't use first match
189 mkdir -p /gpg/gnupghome
190 cp /cdrom/gnupghome/* /gpg/gnupghome
191 bootdone samizdat-gpg
192 fi
187 fi 193 fi
188else 194else
189 grok_block & 195 grok_block &