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:
parent
edd1dcd091
commit
c2e84cab3a
10
meson.build
10
meson.build
|
@ -1593,8 +1593,8 @@ if conf.get('ENABLE_RESOLVE') == 1
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : rootlibexecdir)
|
install_dir : rootlibexecdir)
|
||||||
|
|
||||||
exe = executable('systemd-resolve',
|
exe = executable('resolvectl',
|
||||||
systemd_resolve_sources,
|
resolvectl_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
link_with : [libshared,
|
link_with : [libshared,
|
||||||
libbasic_gcrypt,
|
libbasic_gcrypt,
|
||||||
|
@ -1608,8 +1608,12 @@ if conf.get('ENABLE_RESOLVE') == 1
|
||||||
public_programs += [exe]
|
public_programs += [exe]
|
||||||
|
|
||||||
meson.add_install_script(meson_make_symlink,
|
meson.add_install_script(meson_make_symlink,
|
||||||
join_paths(bindir, 'systemd-resolve'),
|
join_paths(bindir, 'resolvectl'),
|
||||||
join_paths(rootsbindir, 'resolvconf'))
|
join_paths(rootsbindir, 'resolvconf'))
|
||||||
|
|
||||||
|
meson.add_install_script(meson_make_symlink,
|
||||||
|
join_paths(bindir, 'resolvectl'),
|
||||||
|
join_paths(bindir, 'systemd-resolve'))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if conf.get('ENABLE_LOGIND') == 1
|
if conf.get('ENABLE_LOGIND') == 1
|
||||||
|
|
|
@ -67,11 +67,11 @@ systemd_resolved_sources = files('''
|
||||||
resolved-etc-hosts.c
|
resolved-etc-hosts.c
|
||||||
'''.split())
|
'''.split())
|
||||||
|
|
||||||
systemd_resolve_sources = files('''
|
resolvectl_sources = files('''
|
||||||
resolvconf-compat.c
|
resolvconf-compat.c
|
||||||
resolvconf-compat.h
|
resolvconf-compat.h
|
||||||
resolve-tool.c
|
resolvectl.c
|
||||||
resolve-tool.h
|
resolvectl.h
|
||||||
'''.split())
|
'''.split())
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "fileio.h"
|
#include "fileio.h"
|
||||||
#include "parse-util.h"
|
#include "parse-util.h"
|
||||||
#include "resolvconf-compat.h"
|
#include "resolvconf-compat.h"
|
||||||
#include "resolve-tool.h"
|
#include "resolvectl.h"
|
||||||
#include "resolved-def.h"
|
#include "resolved-def.h"
|
||||||
#include "string-util.h"
|
#include "string-util.h"
|
||||||
#include "strv.h"
|
#include "strv.h"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "pager.h"
|
#include "pager.h"
|
||||||
#include "parse-util.h"
|
#include "parse-util.h"
|
||||||
#include "resolvconf-compat.h"
|
#include "resolvconf-compat.h"
|
||||||
#include "resolve-tool.h"
|
#include "resolvectl.h"
|
||||||
#include "resolved-def.h"
|
#include "resolved-def.h"
|
||||||
#include "resolved-dns-packet.h"
|
#include "resolved-dns-packet.h"
|
||||||
#include "strv.h"
|
#include "strv.h"
|
Loading…
Reference in New Issue