diff --git a/meson.build b/meson.build index 6b633dfb6d..734a289755 100644 --- a/meson.build +++ b/meson.build @@ -1593,8 +1593,8 @@ if conf.get('ENABLE_RESOLVE') == 1 install : true, install_dir : rootlibexecdir) - exe = executable('systemd-resolve', - systemd_resolve_sources, + exe = executable('resolvectl', + resolvectl_sources, include_directories : includes, link_with : [libshared, libbasic_gcrypt, @@ -1608,8 +1608,12 @@ if conf.get('ENABLE_RESOLVE') == 1 public_programs += [exe] meson.add_install_script(meson_make_symlink, - join_paths(bindir, 'systemd-resolve'), + join_paths(bindir, 'resolvectl'), join_paths(rootsbindir, 'resolvconf')) + + meson.add_install_script(meson_make_symlink, + join_paths(bindir, 'resolvectl'), + join_paths(bindir, 'systemd-resolve')) endif if conf.get('ENABLE_LOGIND') == 1 diff --git a/src/resolve/meson.build b/src/resolve/meson.build index f56ac451c6..a6157743ef 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -67,11 +67,11 @@ systemd_resolved_sources = files(''' resolved-etc-hosts.c '''.split()) -systemd_resolve_sources = files(''' +resolvectl_sources = files(''' resolvconf-compat.c resolvconf-compat.h - resolve-tool.c - resolve-tool.h + resolvectl.c + resolvectl.h '''.split()) ############################################################ diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c index 7f48610701..62f2131886 100644 --- a/src/resolve/resolvconf-compat.c +++ b/src/resolve/resolvconf-compat.c @@ -10,7 +10,7 @@ #include "fileio.h" #include "parse-util.h" #include "resolvconf-compat.h" -#include "resolve-tool.h" +#include "resolvectl.h" #include "resolved-def.h" #include "string-util.h" #include "strv.h" diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolvectl.c similarity index 99% rename from src/resolve/resolve-tool.c rename to src/resolve/resolvectl.c index 7b583fbe91..2894241063 100644 --- a/src/resolve/resolve-tool.c +++ b/src/resolve/resolvectl.c @@ -24,7 +24,7 @@ #include "pager.h" #include "parse-util.h" #include "resolvconf-compat.h" -#include "resolve-tool.h" +#include "resolvectl.h" #include "resolved-def.h" #include "resolved-dns-packet.h" #include "strv.h" diff --git a/src/resolve/resolve-tool.h b/src/resolve/resolvectl.h similarity index 100% rename from src/resolve/resolve-tool.h rename to src/resolve/resolvectl.h