From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 2 Apr 2018 14:06:02 +0000 (+0100)
Subject: pakfire: Rename new key to pakfire-2018.key
X-Git-Tag: v2.19-core120~7^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=397d3a8e153c38fc3262e463b5bb7ae6db66ec52;p=people%2Fstevee%2Fipfire-2.x.git

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 6cd531d158..bd5559597a 100644
--- 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 88f7d047f4..efcf693ec3 100644
--- 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 1238833d58..c01a46a36a 100644
--- 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