resolvectl: rename systemd-resolve to resolvectl

For the compatibility, `systemd-resolve` will be created as a symbolic
link to `resolvectl`.
This commit is contained in:
Yu Watanabe 2018-04-19 03:24:23 +09:00
parent edd1dcd091
commit c2e84cab3a
5 changed files with 12 additions and 8 deletions

View File

@ -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

View File

@ -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())
############################################################

View File

@ -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"

View File

@ -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"