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

This commit is contained in:
Arne Fitzenreiter
2017-12-12 07:53:33 +01:00
52 changed files with 356 additions and 112 deletions

View File

@@ -904,7 +904,7 @@ sub checkcryptodb {
logger("CRYPTO INFO: Checking GnuPG Database");
my $ret = system("gpg --list-keys | grep -q $myid");
unless ( "$ret" eq "0" ) {
message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this.");
message("CRYPTO WARN: It's normal to see this on first execution.");
message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";