From 16c6ed3bbc68f6cbc0775c7fb1e588a9d82c833b Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Mon, 23 Mar 2020 11:45:40 +0100 Subject: [PATCH] Skip resolvectl for now On Fedora it does not work as expected when invoked as resolvconf. Also the exit status is not 0 so the test does not work actually: $ resolvconf -a -f ; echo $? Expected interface name as argument. 1 $ --- configure.ac | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 9bab4f5..07a1819 100644 --- a/configure.ac +++ b/configure.ac @@ -408,25 +408,20 @@ AC_ARG_ENABLE([resolvconf], [Enable usage of resolvconf by default, \ use --disable-resolvconf for the opposite])) -# Checks for to determine how resolvconf works is it is installed -# openresolv supports a -l option that lists the active configurations and returns 0 -# resolvctl supports -a -f which silently exits if no interface is suppplied -# the resolvconf script in Ubuntu/Debian does not support listing -# but returns 99 if invoked without parameters -# +# Determine how resolvconf works at build-time if it is installed: +# * openresolv supports option -l that lists active configurations and returns 0 +# * resolvconf in Ubuntu/Debian does not support listing but returns 99 +# if invoked without parameters +# * skip resolvectl which does not work as expected when invoked as resolveconf AS_IF([test "x$enable_resolvconf" = "x" ], [ AC_CHECK_FILE([$RESOLVCONF_PATH],[ AS_IF([$RESOLVCONF_PATH -l &>/dev/null], [ enable_resolvconf="yes" ],[ - AS_IF([$RESOLVCONF_PATH -a -f &>/dev/null], [ + AS_IF([$RESOLVCONF_PATH &>/dev/null ; test $? -eq 99], [ enable_resolvconf="yes" ],[ - AS_IF([$RESOLVCONF_PATH &>/dev/null ; test $? -eq 99], [ - enable_resolvconf="yes" - ],[ - enable_resolvconf="no" - ]) + enable_resolvconf="no" ]) ]) ],[ -- GitLab