Merge remote-tracking branch 'origin/master' into kernel-4.14

diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index 459262c86e0edf25c60ae5a5f4db7ad5604ec6f0..0744f3a7f16acc08869bf6553493fe03ec3761a6 100644 (file)
--- 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
 

diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire
index 43befc79697b44a40aff6fbe87ca24153c157127..d59daabce7be1f95a79479e19916d6f3555ea890 100644 (file)
--- a/src/initscripts/system/pakfire
+++ b/src/initscripts/system/pakfire
@@ -9,6 +9,8 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+export GNUPGHOME="/opt/pakfire/etc/.gnupg"
+
 case "${1}" in
        start)
                boot_mesg "Setting up Pakfire Package Manager..."

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 202c1e5a142f83200f89b2d3c6544f8a16d57d3e..dfba9155681b4576c3bd9780ec86b68d8c2175ed 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -24,6 +24,9 @@
        delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
        $< = $>;
 
+       # Store keys here
+       $ENV{"GNUPGHOME"} = "/opt/pakfire/etc/.gnupg";
+
        require "/opt/pakfire/lib/functions.pl";
        
        my $interactive = 1;