diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-14 14:56:43 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-14 14:56:43 -0700 |
| commit | 7fcb98754581d6195ba58a49595a5dfedb60ce49 (patch) | |
| tree | 226be8027ed1cf5af9d6ae913f78310b342425b3 | |
| parent | cd5382ad4982731a7b7584173e9e4ee5108bc16e (diff) | |
| download | vyatta-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
| -rw-r--r-- | scripts/system/vyatta_update_console.pl | 2 | ||||
| -rw-r--r-- | templates/system/console/device/node.def | 6 | ||||
| -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.def | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/scripts/system/vyatta_update_console.pl b/scripts/system/vyatta_update_console.pl index a6c08916..fabfc242 100644 --- a/scripts/system/vyatta_update_console.pl +++ b/scripts/system/vyatta_update_console.pl @@ -42,7 +42,7 @@ sub update_inittab { close $inittab; my $config = new Vyatta::Config; - $config->setLevel("system console"); + $config->setLevel("system console device"); my $id = 0; foreach my $tty ($config->listNodes()) { 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 |