2 files changed, 26 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index f5e47d8..d4b44b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ boot
 var
 isolinux/live/initrd.img
 isolinux/live/vmlinuz
+gnupghome
+secrets
diff --git a/xorriso.sh b/xorriso.sh
index 29e1ff6..784f2ef 100755
--- a/xorriso.sh
+++ b/xorriso.sh
@@ -6,6 +6,28 @@ volid=SamizdatLive
 squashfs_iso_path=live/filesystem.squashfs
 btrfs_iso_path=live/filesystem.btrfs
 btrfs_filesystem=debian-live-8.4.0-amd64-standard.btrfs
+gpg_iso_path=samizdat/gpg/gnupghome
+gnupghome=gnupghome
+secrets=secrets
+
+die() { printf '%s\n' "$*"; exit 1; }
+
+make_gnupghome()
+{
+  [ -d "$gnupghome" ] && return
+  local reset=$-
+  set -e
+  [ ! -d "$gnupghome".tmp ] || die "Error: refusing to overwrite $gnupghome.tmp"
+  [ ! -d "$secrets".tmp   ] || die "Error: refusing to overwrite $secrets.tmp"
+  mkdir -p "$gnupghome".tmp "$secrets".tmp
+  local PATH="$HOME"/src/samizdat/src:"$PATH" NO_USE_RAMFS=y
+  NEW_GNUPGHOME="$gnupghome".tmp SECRETS_DIRECTORY="$secrets".tmp ~/src/samizdat/src/samizdat-make-key --adam
+  mv "$secrets".tmp "$secrets"
+  mv "$gnupghome".tmp "$gnupghome"
+  set -$reset
+}
+
+make_gnupghome
 
 set -ex
 
@@ -18,5 +40,6 @@ xorriso \
         -pathspecs on -overwrite on \
         -rm "$squashfs_iso_path" -- \
         -add_plainly any \
-        "${btrfs_iso_path}=${btrfs_filesystem}"
+        "${btrfs_iso_path}=${btrfs_filesystem}" \
+        "${gpg_iso_path}=${gnupghome}"
 mv -f "$outdev"~ "$outdev"