pakfire: Rename new key to pakfire-2018.key

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

diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index 6cd531d1588b94ff041c01e599fea2af59afc882..bd5559597ac643f70176fdc7442e08d851d6be8b 100644 (file)
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -6,7 +6,7 @@ opt/pakfire/db/rootfiles
 #opt/pakfire/etc
 #opt/pakfire/pakfire.conf
 opt/pakfire/etc/pakfire.conf
-opt/pakfire/pakfire.key
+opt/pakfire/pakfire-2018.key
 #opt/pakfire/lib
 opt/pakfire/lib/functions.pl
 opt/pakfire/lib/functions.sh

diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files
index 88f7d047f42865a2897edeb8c6960df454537377..efcf693ec378db8e074e380301eeb18b948d0975 100644 (file)
--- a/config/rootfiles/core/120/filelists/files
+++ b/config/rootfiles/core/120/filelists/files
@@ -7,7 +7,7 @@ etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/unbound
 etc/rc.d/rcsysinit.d/S81pakfire
 opt/pakfire/lib/functions.pl
-opt/pakfire/pakfire.key
+opt/pakfire/pakfire-2018.key
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/qos.cgi

diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire
index 1238833d588df6d369a10f68629e72cb083d5a1a..c01a46a36a7ec138c458b09c043d25ecead90d9b 100644 (file)
--- a/src/initscripts/system/pakfire
+++ b/src/initscripts/system/pakfire
@@ -12,7 +12,7 @@
 case "${1}" in
        start)
                boot_mesg "Setting up Pakfire Package Manager..."
-               gpg --import /opt/pakfire/pakfire.key &>/dev/null
+               gpg --import /opt/pakfire/pakfire-2018.key &>/dev/null
                evaluate_retval
                ;;
 

diff --git a/src/pakfire/pakfire.key b/src/pakfire/pakfire-2018.key
similarity index 100%
rename from src/pakfire/pakfire.key
rename to src/pakfire/pakfire-2018.key