summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-01-20 22:10:00 +0100
committerLennart Poettering <lennart@poettering.net>2016-01-25 16:00:28 +0100
commitb5eb973b39665d6a66f5a498fbdb511765e646e2 (patch)
tree90ed92bbe75415a32d5d15a540388d982a6f5089
parentce736ace37399f3dc45e6981852881a6f2448de2 (diff)
resolve: rename "systemd-resolve-host" tool to simply "systemd-resolve"
The tool resolves way more than just hosts, hence give it a more generic name. This should be safe, as the tool is currently undocumented. Before we add documentation for it, let's get the name right. This also moves the C source into src/resolve/ (from src/resolve-host/), since the old name is a misnomer now. Also, since it links directly to many of the C files of resolved it really belongs into resolved's directory anyway.
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am10
l---------src/resolve-host/Makefile1
-rw-r--r--src/resolve/resolve-tool.c (renamed from src/resolve-host/resolve-host.c)0
4 files changed, 6 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 549dc8357f..c045ea4378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,7 +109,7 @@
/systemd-remount-api-vfs
/systemd-remount-fs
/systemd-reply-password
-/systemd-resolve-host
+/systemd-resolve
/systemd-resolved
/systemd-rfkill
/systemd-run
diff --git a/Makefile.am b/Makefile.am
index fad5ff9d74..5036a2bfc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5267,8 +5267,8 @@ libnss_resolve_la_LIBADD = \
lib_LTLIBRARIES += \
libnss_resolve.la
-systemd_resolve_host_SOURCES = \
- src/resolve-host/resolve-host.c \
+systemd_resolve_SOURCES = \
+ src/resolve/resolve-tool.c \
src/resolve/resolved-dns-packet.c \
src/resolve/resolved-dns-packet.h \
src/resolve/resolved-dns-rr.c \
@@ -5280,15 +5280,15 @@ systemd_resolve_host_SOURCES = \
src/resolve/dns-type.c \
src/resolve/dns-type.h
-nodist_systemd_resolve_host_SOURCES = \
+nodist_systemd_resolve_SOURCES = \
src/resolve/dns_type-from-name.h \
src/resolve/dns_type-to-name.h
-systemd_resolve_host_LDADD = \
+systemd_resolve_LDADD = \
libshared.la
rootlibexec_PROGRAMS += \
- systemd-resolve-host
+ systemd-resolve
tests += \
test-dns-domain \
diff --git a/src/resolve-host/Makefile b/src/resolve-host/Makefile
deleted file mode 120000
index d0b0e8e008..0000000000
--- a/src/resolve-host/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile \ No newline at end of file
diff --git a/src/resolve-host/resolve-host.c b/src/resolve/resolve-tool.c
index 54a060ea5a..54a060ea5a 100644
--- a/src/resolve-host/resolve-host.c
+++ b/src/resolve/resolve-tool.c