summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-08-24 02:24:08 +0200
committerTails developers <amnesia@boum.org>2012-08-24 02:24:08 +0200
commit103c55b00664f7079d48d40c072adedba6b6e892 (patch)
treeec0fe4a5a9e13dac3be6fe2ca9c8653bb0767c97
parentf786bca50b7c25e574da70a1b157c1dc07b66e55 (diff)
Bring back GnuPG key import that was removed by faulty merge.0.13-rc1
-rwxr-xr-xconfig/chroot_local-includes/lib/live/config/2000-import-gnupg-key6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/chroot_local-includes/lib/live/config/2000-import-gnupg-key b/config/chroot_local-includes/lib/live/config/2000-import-gnupg-key
index 55d398c..ebfcb41 100755
--- a/config/chroot_local-includes/lib/live/config/2000-import-gnupg-key
+++ b/config/chroot_local-includes/lib/live/config/2000-import-gnupg-key
@@ -5,6 +5,12 @@ Import_GnuPG_key ()
echo "- importing GnuPG key"
sudo -H -u "${LIVE_USERNAME}" gpg --batch --import /usr/share/doc/tails/website/*.key
+ echo "- importing GnuPG signing key into tails-iuk's trusted keyring"
+ mkdir -p /usr/share/tails-iuk/trusted_gnupg_homedir
+ gpg --batch --homedir /usr/share/tails-iuk/trusted_gnupg_homedir \
+ --import /usr/share/doc/tails/website/tails-signing.key
+ chmod -R go+rX /usr/share/tails-iuk/trusted_gnupg_homedir/*
+
# Creating state file
touch /var/lib/live/config/import-gnupg-key
}