1 files changed, 2 insertions, 64 deletions

diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index a7056ad..d194486 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -7,15 +7,6 @@ case "$DEVNAME" in /dev/loop*|/dev/ram*|/dev/dm-*|/dev/md*|/dev/fd*) exit ;; esa
 
 debug_log "grok-block.${DEVNAME##*/}"
 
-addmenu_choosekey()
-{
-  dev=$1
-  dir=$2
-  addmenu "$dev//$dir" \
-          "[ Use the GPG key on $dev ]" \
-          "menu-select boot-gpg $dev $dir"
-}
-
 addmenu_repairhfs()
 {
   local device="$1"
@@ -87,26 +78,6 @@ retry_mount()
   done
 }
 
-Gpg2()
-{
-    gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options "$@"
-}
-
-gpg_verify()
-{
-  [ -e "$1" ] || return
-  bootwait samizdat-gpg
-  export GNUPGHOME=/gpg/gnupghome
-  Gpg2 --verify "$1"
-}
-
-gpg_can_decrypt()
-{
-  [ -e "$1" ] || return
-  bootwait samizdat-gpg
-  Gpg2 --decrypt "$1" | Gpg2 --decrypt "$1" >/dev/null
-}
-
 is_lvm()
 {
   for n in 0 1 2 3; do
@@ -229,21 +200,7 @@ grok_block()
       # TODO: And what if we create partitions and then reboot the machine mid-install?
 
   elif [ "$ID_PART_ENTRY_NAME" = samizdat-rootfs ]; then
-      :
-
-  elif [ "$ID_PART_ENTRY_NAME" = samizdat-keys ]; then
-      mkdir -p /gpg
-      cp -a "$mountpoint"/gnupghome /gpg/ && bootdone samizdat-gpg && bootdone samizdat-cdrom
-
-  elif [ "$ID_PART_ENTRY_NAME" = samizdat-plaintext ]; then
-    if gpg_verify "$mountpoint"/disk.key && gpg_can_decrypt "$mountpoint"/disk.key; then
-      umount "$mountpoint"
-      addmenu_choose_native_root "$(parent_device "$DEVNAME")"
-      bootdone key-mounted
-    else
-      umount "$mountpoint"
-    fi
-
+    bootdone samizdat-rootfs
   elif [ "$DEVNAME" = /dev/nbd1 ]; then
     # This is our rootfs, over the network
     umount "$mountpoint"
@@ -307,25 +264,6 @@ eval "$(PATH=$PATH:/lib/udev vol_id "$DEVNAME" |
   sed "s/'/'\\\\''/; s/=\(.*\)/='\1'/"
 )"
 
-CDROM_ID_FS_UUID_ENC='73256269-4002-4e42-adbd-0e49ed1c7438'
-CDROM_ID_FS_LABEL_ENC=$(sed 's/ /\\x20/g' /lib/samizdat/vol_id.txt)
-if [ "$ID_FS_UUID_ENC"  = "$CDROM_ID_FS_UUID_ENC" -o \
-     "$ID_FS_LABEL_ENC" = "$CDROM_ID_FS_LABEL_ENC" ]
-then
-  # Recognize and mount the Samizdat
-  if ! mountpoint -q /cdrom; then
-    mkdir -p /cdrom
-    . mdadm-dup.sh
-    dup_mount_cdrom "$DEVNAME" /cdrom && bootdone samizdat-cdrom
-    if [ -e /cdrom/gnupghome ]; then
-      # TODO: don't use first match
-      mkdir -p /gpg/gnupghome
-      cp /cdrom/gnupghome/* /gpg/gnupghome
-      bootdone samizdat-gpg
-    fi
-  fi
-else
-  grok_block &
-fi
+grok_block &
 
 # vim:set et sw=2: