diff options
Diffstat (limited to 'src/initrd/btrfs-create.sh')
-rw-r--r-- | src/initrd/btrfs-create.sh | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh index 5d359a9..b5cc2c5 100644 --- a/src/initrd/btrfs-create.sh +++ b/src/initrd/btrfs-create.sh | |||
@@ -80,6 +80,7 @@ samizdat_movemounts() | |||
80 | mount -o move /cdrom /root/cdrom | 80 | mount -o move /cdrom /root/cdrom |
81 | mkdir -p /run/initramfs/samizdat/log | 81 | mkdir -p /run/initramfs/samizdat/log |
82 | cp /var/log/* /run/initramfs/samizdat/log | 82 | cp /var/log/* /run/initramfs/samizdat/log |
83 | umount /gpg | ||
83 | true | 84 | true |
84 | } | 85 | } |
85 | 86 | ||
@@ -172,15 +173,15 @@ partition_new_hard_drive_DESTROYING_EVERYTHING() | |||
172 | { | 173 | { |
173 | local target="$1" | 174 | local target="$1" |
174 | # [ "$(parted -sm "$target" print | grep -c :)" = 1 ] || return | 175 | # [ "$(parted -sm "$target" print | grep -c :)" = 1 ] || return |
175 | parted "$target" -sm \ | 176 | parted "$target" -sm \ |
176 | unit B \ | 177 | unit B \ |
177 | mklabel gpt \ | 178 | mklabel gpt \ |
178 | mkpart primary 32KiB 4MiB \ | 179 | mkpart samizdat-grub-incomplete 32KiB 4MiB \ |
179 | set 1 bios_grub on \ | 180 | set 1 bios_grub on \ |
180 | mkpart primary btrfs 4MiB 1GiB \ | 181 | mkpart samizdat-plaintext-incomplete btrfs 4MiB 1GiB \ |
181 | name 2 gpg-incomplete \ | 182 | mkpart samizdat-luks-encrypted-incomplete 1GiB 100% \ |
182 | mkpart primary 1GiB 100% \ | 183 | && |
183 | name 3 luks-incomplete | 184 | udevadm settle |
184 | } | 185 | } |
185 | 186 | ||
186 | open_samizdat() | 187 | open_samizdat() |
@@ -227,11 +228,9 @@ open_samizdat_blockdev() | |||
227 | 228 | ||
228 | init_samizdat_blockdev() | 229 | init_samizdat_blockdev() |
229 | { | 230 | { |
230 | local imgfile="$1" megs="$2" keyfile="$3" dev | 231 | local dev="$1" keyfile="$2" |
231 | local cryptname=samizdatcrypt | 232 | local cryptname=samizdatcrypt |
232 | 233 | ||
233 | dev=$(init_samizdat_lodev "$imgfile" "$megs") || return | ||
234 | |||
235 | [ ! -b /dev/mapper/"$cryptname" ] || return | 234 | [ ! -b /dev/mapper/"$cryptname" ] || return |
236 | 235 | ||
237 | luks_secret >/dev/null | 236 | luks_secret >/dev/null |