summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2011-03-16 08:54:13 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-03-16 08:54:13 -0700
commit22b23b946a307375bd6eb95c87cfc59e6455a91c (patch)
tree97c98415dbcf8d137e4e981c90ab60b0f33f0651
parent4c15e64167ee8408ef2d9f8f186644665ac0d588 (diff)
parent1edcbef6659695508dfecef648fb94e16f445966 (diff)
downloadvyatta-cfg-system-22b23b946a307375bd6eb95c87cfc59e6455a91c.tar.gz
vyatta-cfg-system-22b23b946a307375bd6eb95c87cfc59e6455a91c.zip
Merge branch 'napa' of suva.vyatta.com:/git/vyatta-cfg-system into napa
-rw-r--r--templates/system/console/device/node.def3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/system/console/device/node.def b/templates/system/console/device/node.def
index 20fd6580..41fcf3fb 100644
--- a/templates/system/console/device/node.def
+++ b/templates/system/console/device/node.def
@@ -2,7 +2,8 @@ tag:
type: txt
help: Serial console device name
val_help: <ttyXX>; Serial device name
+ <hvc0>; Xen console
-syntax:expression: pattern $VAR(@) "^tty[A-Z]+[0-9]+$" \
+syntax:expression: pattern $VAR(@) "^((tty[A-Z])||(hvc)){1}[0-9]+$" \
; "console $VAR(@): not a valid tty name"