diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91652b08..e49cfd34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: needs: smoke-tests - container: ghcr.io/pi-hole/ftl-build:v1.19-${{ matrix.arch }} + container: ghcr.io/pi-hole/ftl-build:v1.22-${{ matrix.arch }} strategy: fail-fast: false diff --git a/src/args.c b/src/args.c index 94bab36b..dee6e55f 100644 --- a/src/args.c +++ b/src/args.c @@ -13,6 +13,12 @@ #include "dnsmasq/dnsmasq.h" #undef __USE_XOPEN +#include +#if !defined(NETTLE_VERSION_MAJOR) +# define NETTLE_VERSION_MAJOR 2 +# define NETTLE_VERSION_MINOR 0 +#endif + #include "FTL.h" #include "args.h" #include "version.h" @@ -258,6 +264,10 @@ void parse_args(int argc, char* argv[]) printf("\n"); printf("******************************** LUA ********************************\n"); printf(LUA_COPYRIGHT"\n"); + printf("\n"); + printf("***************************** LIBNETTLE *****************************\n"); + printf("Version: %d.%d\n", NETTLE_VERSION_MAJOR, NETTLE_VERSION_MINOR); + printf("GMP: %s\n", NETTLE_USE_MINI_GMP ? "Mini" : "Full"); exit(EXIT_SUCCESS); } diff --git a/test/pihole-FTL.conf b/test/pihole-FTL.conf index 2d562a67..1f941296 100644 --- a/test/pihole-FTL.conf +++ b/test/pihole-FTL.conf @@ -2,6 +2,7 @@ DEBUG_ALL=true RESOLVE_IPV4=no RESOLVE_IPV6=no CHECK_LOAD=false +CHECK_DISK=0 LOCAL_IPV4=10.100.0.10 LOCAL_IPV6=fe80::10 BLOCK_IPV4=10.100.0.11