diff options
author | Andrew Cady <d@jerkface.net> | 2020-10-10 19:28:10 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-10-10 19:28:10 -0400 |
commit | 7e58194eb06762d7e6a99558dfe90e6485da89aa (patch) | |
tree | 477cb0b3d1cadc899773d6343e322f84495a66f9 /src/initrd | |
parent | 319e8a24f991aa2d1a81ddf9319c8214b73c9027 (diff) |
about to reboot and try this shit
Diffstat (limited to 'src/initrd')
-rwxr-xr-x | src/initrd/grok-block | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/initrd/grok-block b/src/initrd/grok-block index ee23b38..0b5f3f9 100755 --- a/src/initrd/grok-block +++ b/src/initrd/grok-block | |||
@@ -177,14 +177,15 @@ grok_block() | |||
177 | case "$ID_PART_ENTRY_NAME" in | 177 | case "$ID_PART_ENTRY_NAME" in |
178 | samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;; | 178 | samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;; |
179 | samizdat-plaintext) | 179 | samizdat-plaintext) |
180 | . /verity.sh | 180 | # . /verity.sh |
181 | cp /verity.sh /run/initramfs/samizdat/ | 181 | # cp /verity.sh /run/initramfs/samizdat/ |
182 | veritysetup --hash-offset="$verity_hash_offset" \ | 182 | # veritysetup --hash-offset="$verity_hash_offset" \ |
183 | create samizverity \ | 183 | # create samizverity \ |
184 | "$DEVNAME" "$DEVNAME" "$verity_root_hash" | 184 | # "$DEVNAME" "$DEVNAME" "$verity_root_hash" |
185 | bootdone veritysetup | 185 | # bootdone veritysetup |
186 | return | 186 | return |
187 | ;; | 187 | ;; |
188 | samizdat-keys) ;; | ||
188 | samizdat-grub) return ;; | 189 | samizdat-grub) return ;; |
189 | samizdat-luks-encrypted) | 190 | samizdat-luks-encrypted) |
190 | menu-select boot-native "$(parent_device "$DEVNAME")" | 191 | menu-select boot-native "$(parent_device "$DEVNAME")" |
@@ -218,6 +219,10 @@ grok_block() | |||
218 | # TODO: Need option to boot the partitions we create | 219 | # TODO: Need option to boot the partitions we create |
219 | # TODO: And what if we create partitions and then reboot the machine mid-install? | 220 | # TODO: And what if we create partitions and then reboot the machine mid-install? |
220 | 221 | ||
222 | elif [ "$ID_PART_ENTRY_NAME" = samizdat-keys ]; then | ||
223 | mkdir -p /gpg | ||
224 | cp -a "$mountpoint"/gnupghome /gpg/ && bootdone samizdat-gpg && bootdone samizdat-cdrom | ||
225 | |||
221 | elif [ "$ID_PART_ENTRY_NAME" = samizdat-plaintext ]; then | 226 | elif [ "$ID_PART_ENTRY_NAME" = samizdat-plaintext ]; then |
222 | if gpg_verify "$mountpoint"/disk.key && gpg_can_decrypt "$mountpoint"/disk.key; then | 227 | if gpg_verify "$mountpoint"/disk.key && gpg_can_decrypt "$mountpoint"/disk.key; then |
223 | addmenu_choose_native_root "$(parent_device "$DEVNAME")" | 228 | addmenu_choose_native_root "$(parent_device "$DEVNAME")" |