From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 3 Apr 2018 16:34:24 +0000 (+0100)
Subject: core120: Update pakfire keystore
X-Git-Tag: v2.19-core120~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d058a56b0ccb6cb96e06aedf66d19648ad58ec;p=ipfire-2.x.git

core120: Update pakfire keystore

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index 459262c86e..0744f3a7f1 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -74,6 +74,12 @@ fi
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
+# Remove any pakfire keys stored in /
+rm -rfv /.gnupg
+
+# Move old pakfire keystore into new place
+mv -v /root/.gnupg /opt/pakfire/etc/.gnupg
+
 # Import new Pakfire key
 /etc/init.d/pakfire start