From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 4 Apr 2018 19:38:24 +0000 (+0200)
Subject: core120: don't (re)move old packfire/gpg databases
X-Git-Tag: v2.19-core120~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a554acea163fa51e0a9e5081003e4148ffdfc24b;p=ipfire-2.x.git

core120: don't (re)move old packfire/gpg databases

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index 0744f3a7f1..459262c86e 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -74,12 +74,6 @@ 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