From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, core120, updated. a554acea163fa51e0a9e5081003e4148ffdfc24b Date: Wed, 04 Apr 2018 20:40:49 +0100 Message-ID: <20180404194050.3E6511081DF2@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0032198364428009440==" List-Id: --===============0032198364428009440== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core120 has been updated via a554acea163fa51e0a9e5081003e4148ffdfc24b (commit) from 072a19ec6419f1b18c1e4e9c98572b53a477089d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a554acea163fa51e0a9e5081003e4148ffdfc24b Author: Arne Fitzenreiter Date: Wed Apr 4 21:38:24 2018 +0200 core120: don't (re)move old packfire/gpg databases =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/120/update.sh | 6 ------ 1 file changed, 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/= update.sh index 0744f3a7f..459262c86 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 =20 -# 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 =20 hooks/post-receive -- IPFire 2.x development tree --===============0032198364428009440==--