summaryrefslogtreecommitdiff
path: root/templates/system
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-14 14:56:43 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-14 14:56:43 -0700
commit7fcb98754581d6195ba58a49595a5dfedb60ce49 (patch)
tree226be8027ed1cf5af9d6ae913f78310b342425b3 /templates/system
parentcd5382ad4982731a7b7584173e9e4ee5108bc16e (diff)
downloadvyatta-cfg-system-7fcb98754581d6195ba58a49595a5dfedb60ce49.tar.gz
vyatta-cfg-system-7fcb98754581d6195ba58a49595a5dfedb60ce49.zip
Change syntax for console config
Use: system console device ttyS1 speed 115200 To allow top level node to be one transaction with one update
Diffstat (limited to 'templates/system')
-rw-r--r--templates/system/console/device/node.def6
-rw-r--r--templates/system/console/device/node.tag/speed/node.def (renamed from templates/system/console/node.tag/speed/node.def)0
-rw-r--r--templates/system/console/node.def5
3 files changed, 7 insertions, 4 deletions
diff --git a/templates/system/console/device/node.def b/templates/system/console/device/node.def
new file mode 100644
index 00000000..76ce02bc
--- /dev/null
+++ b/templates/system/console/device/node.def
@@ -0,0 +1,6 @@
+tag:
+type: txt
+help: Serial console device name
+val_help: <ttyX>; Serial device name
+syntax:expression: pattern $VAR(@) "^tty[A-Z0-9]+$" \
+ ; "console $VAR(@): not a valid tty name"
diff --git a/templates/system/console/node.tag/speed/node.def b/templates/system/console/device/node.tag/speed/node.def
index 637f12c7..637f12c7 100644
--- a/templates/system/console/node.tag/speed/node.def
+++ b/templates/system/console/device/node.tag/speed/node.def
diff --git a/templates/system/console/node.def b/templates/system/console/node.def
index b3c11f2a..992cf4e5 100644
--- a/templates/system/console/node.def
+++ b/templates/system/console/node.def
@@ -1,6 +1,3 @@
-tag:
-type: txt
+priority: 100
help: Serial console configuration
-syntax:expression: pattern $VAR(@) "^tty[A-Z0-9]+$" \
- ; "console $VAR(@): not a valid tty name"
end: /opt/vyatta/sbin/vyatta_update_console.pl