summaryrefslogtreecommitdiff
path: root/templates/system
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-14 14:44:06 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-14 14:44:06 -0700
commitcd5382ad4982731a7b7584173e9e4ee5108bc16e (patch)
tree81a29860ddb0a85f63be3bc55ee784120dc4be14 /templates/system
parent9a09a382f874510f3427cf0a212b87fdb5b8e8d2 (diff)
downloadvyatta-cfg-system-cd5382ad4982731a7b7584173e9e4ee5108bc16e.tar.gz
vyatta-cfg-system-cd5382ad4982731a7b7584173e9e4ee5108bc16e.zip
Fix serial console setup functions
Problems found during basic testing of new serial console config
Diffstat (limited to 'templates/system')
-rw-r--r--templates/system/console/node.def1
-rw-r--r--templates/system/console/node.tag/speed/node.def4
2 files changed, 2 insertions, 3 deletions
diff --git a/templates/system/console/node.def b/templates/system/console/node.def
index 9e946c7e..b3c11f2a 100644
--- a/templates/system/console/node.def
+++ b/templates/system/console/node.def
@@ -1,7 +1,6 @@
tag:
type: txt
help: Serial console configuration
-allowed: (cd $dev; echo tty*)
syntax:expression: pattern $VAR(@) "^tty[A-Z0-9]+$" \
; "console $VAR(@): not a valid tty name"
end: /opt/vyatta/sbin/vyatta_update_console.pl
diff --git a/templates/system/console/node.tag/speed/node.def b/templates/system/console/node.tag/speed/node.def
index cf2a0d09..637f12c7 100644
--- a/templates/system/console/node.tag/speed/node.def
+++ b/templates/system/console/node.tag/speed/node.def
@@ -1,6 +1,6 @@
type: u32
help: Console baud rate
allowed: echo 1200 2400 4800 9600 19200 38400 57600 115200
-syntax:expression: $VAR(@) in 1200 2400 4800 9600 19200 38400 57600 115200 ;
- "unknown baud rate"
+syntax:expression: $VAR(@) in 1200, 2400, 4800, 9600, 19200, 38400, \
+ 57600, 115200 ; "unknown baud rate"
val_help: u32: 1200-115200: Baud rate for console port