1 files changed, 4 insertions, 48 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 894d835..5a43977 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -5,21 +5,6 @@
 
 losetup() { /sbin/losetup "$@"; }
 
-luks_secret()
-{
-  local parms=$-; # this junk keeps set -x from being too annoying
-  set +x
-  [ -n "$luks_secret" ] || luks_secret="$(head -c256 /dev/urandom)"
-  printf %s "$luks_secret"
-  case $parms in *x*) set -x; set -x ;; esac
-}
-
-floor4()
-{
-  # Negatives round up, but aren't used.
-  echo $(($1 / 4 * 4))
-}
-
 ceil4()
 {
   local x="$1"
@@ -205,11 +190,8 @@ initialize_root_filesystem()
     done
     chroot /root chown -R u:u ${uhome}
 
-    mv /root/root/.gnupg /root/root/.gnupg~
-    mv /gpg/gnupghome /root/root/.gnupg                 || return
-
     copy_execs sbin  mdadm dmsetup cryptsetup fsck.hfsplus
-    copy_execs bin   btrfs rsync gpg gpg2 gpg-agent
+    copy_execs bin   btrfs rsync
 
     # Copy these over unconditionally, because they ought to remain in sync with
     # the initrd.
@@ -333,8 +315,7 @@ open_samizdat_blockdev()
 
   if [ ! -e "$decrypted_keyfile" ]
   then
-    gpg2 --verify "$keyfile" || return
-    gpg2 --output=- --verify "$keyfile" | gpg2 --decrypt > "$decrypted_keyfile" || return
+    echo -n secret > "$decrypted_keyfile"
   fi
 
   cryptsetup --key-file "$decrypted_keyfile" luksOpen "$dev" "$cryptname" || return
@@ -349,12 +330,9 @@ init_samizdat_blockdev()
 
   [ ! -b /dev/mapper/"$cryptname" ] || return
 
-  luks_secret >/dev/null
-  luks_secret | gpg2 --default-recipient-self --encrypt --armor | gpg2 --clearsign --output "$keyfile" || return
-
-  luks_secret | cryptsetup -v luksFormat "$dev" - || return
+  echo -n secret | cryptsetup -v luksFormat "$dev" - || return
   cryptsetup luksDump "$dev" >&2
-  luks_secret | cryptsetup --key-file - luksOpen "$dev" "$cryptname" || return
+  echo -n secret | cryptsetup --key-file - luksOpen "$dev" "$cryptname" || return
 
   [ -b /dev/mapper/"$cryptname" ] || return
 }
@@ -415,28 +393,6 @@ get_cdrom_sizelimit()
   fi
 }
 
-init_gpg()
-{
-  export GNUPGHOME=/gpg/gnupghome
-  mkdir -p "$GNUPGHOME"
-  if [ -e /gnupghome.tar ]; then
-      tar -C "$GNUPGHOME" -zxf /gnupghome.tar && bootdone samizdat-gpg
-      return
-  else
-      bootwait samizdat-cdrom
-      (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
-      bootdone samizdat-gpg
-  fi
-
-  local LOG_DIR=/run/initramfs/samizdat/log
-  if samizdat-password-agent > "$LOG_DIR"/samizdat-password-agent.log 2>&1; then
-    true
-  else
-    echo 'samizdat-password-agent failed; continuing in hope of hope...'
-    true # false
-  fi
-}
-
 start_meter()
 {
   local startmsg="$*"