From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Sep 2012 19:28:55 +0000 (+0000)
Subject: ipv6-static: Make status output more beatiful.
X-Git-Tag: 005~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c447aaa81aa808136e252614e0993a6d956e17d8;p=network.git

ipv6-static: Make status output more beatiful.
---

diff --git a/hooks/zones/bridge.configs/ipv6-static b/hooks/zones/bridge.configs/ipv6-static
index 62e59484..57dfdefb 100755
--- a/hooks/zones/bridge.configs/ipv6-static
+++ b/hooks/zones/bridge.configs/ipv6-static
@@ -121,16 +121,20 @@ function _status() {
 	
 	config_read $(zone_dir ${zone})/configs/${config}
 
-	printf "        %10s - " "${HOOK}"
+	# Make sure ADDRESS is as short as possible.
+	ADDRESS=$(ipv6_implode ${ADDRESS})
+
+	local status
 	if zone_has_ip ${zone} ${ADDRESS}/${PREFIX}; then
-		echo -ne "${COLOUR_UP} UP ${COLOUR_NORMAL}"
+		status=${MSG_HOOK_UP}
 	else
-		echo -ne "${COLOUR_DOWN}DOWN${COLOUR_NORMAL}"
+		status=${MSG_HOOK_DOWN}
 	fi
-	echo " - $(ipv6_implode ${ADDRESS})/${PREFIX}"
+	cli_statusline 3 "${HOOK}" "${status}"
 
+	cli_print_fmt1 3 "IPv6 address" "${ADDRESS}/${PREFIX}"
 	if [ -n "${GATEWAY}" ]; then
-		echo "          Gateway: ${GATEWAY}"
+		cli_print_fmt1 3 "Gateway" "${GATEWAY}"
 	fi
 	cli_space