Merge branch 'master' into core119

[ipfire-2.x.git] / src / initscripts / system / pakfire

diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire
index 1238833d588df6d369a10f68629e72cb083d5a1a..43befc79697b44a40aff6fbe87ca24153c157127 100644 (file)
--- a/src/initscripts/system/pakfire
+++ b/src/initscripts/system/pakfire
@@ -12,8 +12,11 @@
 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
+
+               # Try to import the old key, too
+               gpg --import /opt/pakfire/pakfire-2007.key &>/dev/null
                ;;
 
        *)