From 983c23fdcb8204238220a26a279d718cd6dff821 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 20 Jul 2010 09:50:31 -0700 Subject: Use val_help: for interface name help Use common method for formatting CLI style help when entering interface name. Move loopback name syntax check into CLI expression to avoid overhead of perl here. --- templates/interfaces/ethernet/node.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/interfaces/ethernet') diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index 1b0a083f..5f196f59 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -2,11 +2,11 @@ tag: priority: 318 type: txt help: Ethernet interface name -comp_help: Enter Ethernet interface name (eth0 - eth999) - allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet +val_help: ; Ethernet interface name syntax:expression: pattern $VAR(@) "^eth[0-9]+$" \ ; "interface ethernet $VAR(@): not a valid name" + syntax:expression: exec \ "if [ ! -d /sys/class/net/$VAR(@) ]; then \ echo \"interface ethernet $VAR(@): does not exist\"; -- cgit v1.2.3