From 6b34112ff0ab6c1f5f177dca4d04d4354f9ca461 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 13 Oct 2012 19:39:42 +0000
Subject: [PATCH] Change dns command to dns-server.

---
 man/Makefile                                      |  2 +-
 man/network-config.8.in                           |  2 +-
 man/{network-dns.8.in => network-dns-server.8.in} | 14 +++++++-------
 man/network.8.in                                  |  6 +++---
 network                                           | 13 +++++++++----
 5 files changed, 21 insertions(+), 16 deletions(-)
 rename man/{network-dns.8.in => network-dns-server.8.in} (77%)

diff --git a/man/Makefile b/man/Makefile
index fba30cb4..d4d26638 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -29,7 +29,7 @@ MANPAGES8   = \
 	network.8 \
 	network-config.8 \
 	network-device.8 \
-	network-dns.8 \
+	network-dns-server.8 \
 	network-route.8 \
 	network-zone.8 \
 	network-zone-bridge.8 \
diff --git a/man/network-config.8.in b/man/network-config.8.in
index 03de638b..235a573c 100644
--- a/man/network-config.8.in
+++ b/man/network-config.8.in
@@ -37,7 +37,7 @@ console.
 .PP
 
 .SH SEE ALSO
-network(8), network-dns(8)
+network(8), network-dns-server(8)
 
 .SH AUTHOR
 Michael Tremer (michael.tremer@ipfire.org)
diff --git a/man/network-dns.8.in b/man/network-dns-server.8.in
similarity index 77%
rename from man/network-dns.8.in
rename to man/network-dns-server.8.in
index 12f975e6..5b2066f7 100644
--- a/man/network-dns.8.in
+++ b/man/network-dns-server.8.in
@@ -1,23 +1,23 @@
-.TH network-dns 8 "22 Jun 2012" "@VERSION@" "network man page"
+.TH network-dns-server 8 "22 Jun 2012" "@VERSION@" "network man page"
 
 .SH NAME
-network-dns \- Network Configuration Control Program
+network-dns-server \- Network Configuration Control Program
 
 .SH SYNOPSIS
-\fBnetwork [OPTIONS] dns [add|remove] <server> [<priority>]\fR
+\fBnetwork [OPTIONS] dns-server [add|remove] <server> [<priority>]\fR
 .P
-\fBnetwork [OPTIONS] dns list\fR
+\fBnetwork [OPTIONS] dns-server list\fR
 .P
-\fBnetwork [OPTIONS] dns update\fR
+\fBnetwork [OPTIONS] dns-server update\fR
 
 .SH DESCRIPTION
-With help of the \fBdns\fR subcommand, you will be able to configure the
+With help of the \fBdns-server\fR subcommand, you will be able to configure the
 local DNS configuration. DNS is short for \fBDomain Name System\fR.
 .PP
 You may add and remove DNS servers as well as view the settings.
 
 .SH OPTIONS
-The \fBnetwork dns\fR command offers various commands:
+The \fBnetwork dns-server\fR command offers various commands:
 
 \fBadd <server> [<priority>]\fR
 .RS 4
diff --git a/man/network.8.in b/man/network.8.in
index e013a276..dd91b7a2 100644
--- a/man/network.8.in
+++ b/man/network.8.in
@@ -105,9 +105,9 @@ after the next reboot.
 .RE
 .PP
 
-\fBdns ...\fR
+\fBdns-server ...\fR
 .RS 4
-The \fBdns\fR command will help you configuring the local DNS servers.
+The \fBdns-server\fR command will help you configuring the local DNS servers.
 .RE
 .PP
 
@@ -128,7 +128,7 @@ Please report all bugs to the official bugtracker at http://bugs.ipfire.org/.
 .SH SEE ALSO
 network-config(8),
 network-device(8),
-network-dns(8),
+network-dns-server(8),
 network-port(8),
 network-zone(8)
 
diff --git a/network b/network
index 00a4f76d..78229005 100755
--- a/network
+++ b/network
@@ -1036,16 +1036,16 @@ function cli_help() {
 	hook_exec ${type} ${what} help
 }
 
-function cli_dns() {
+function cli_dns_server() {
 	if cli_help_requested $@; then
-		cli_show_man network-dns
+		cli_show_man network-dns-server
 		exit ${EXIT_OK}
 	fi
 
 	# Get the command.
 	local cmd=${1}; shift
 	if [ -z "${cmd}" ]; then
-		cli_show_man network-dns
+		cli_show_man network-dns-server
 		exit ${EXIT_ERROR}
 	fi
 
@@ -1097,7 +1097,7 @@ case "${action}" in
 		init_run
 		;;
 
-	config|hostname|port|device|zone|start|stop|restart|status|reset|dns|route)
+	config|hostname|port|device|zone|start|stop|restart|status|reset|route)
 		cli_${action} $@
 		;;
 
@@ -1106,6 +1106,11 @@ case "${action}" in
 		cli_dhcpd ${action/dhcp/ip} $@
 		;;
 
+	# DNS server configuration.
+	dns-server)
+		cli_dns_server $@
+		;;
+
 	""|help|--help|-h)
 		cli_help $@
 		;;
-- 
2.47.3