From 685b04d7cc8807a3c49d53fbf4797f8029ebc2c2 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 12 Sep 2024 06:33:16 +0200
Subject: [PATCH] cli: show configured name servers in 'show dns' command

Before we add proper operational support for DNS and NTP, we can at
least improve on the built-in CLI commands.

Issue #510

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/klish-plugin-infix/xml/infix.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/klish-plugin-infix/xml/infix.xml b/src/klish-plugin-infix/xml/infix.xml
index 8a12c813..22b7ed33 100644
--- a/src/klish-plugin-infix/xml/infix.xml
+++ b/src/klish-plugin-infix/xml/infix.xml
@@ -263,7 +263,8 @@
   </COMMAND>
 
   <COMMAND name="dns" help="Show DNS (client) status">
-    <ACTION sym="script">resolvconf -l</ACTION>
+    <!-- Show static/configured nameservers and then all learned ones from DHCP clients -->
+    <ACTION sym="script">cat /etc/resolv.conf.head 2>/dev/null; resolvconf -l | sed 's/#.*//; /^\s*$/d'</ACTION>
   </COMMAND>
 
   <COMMAND name="ntp" help="Show NTP (client) status">