summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2011-03-15 12:22:49 -0700
committerRobert Bays <robert@vyatta.com>2011-03-15 12:24:06 -0700
commit027f3ba3c8bc757a9bf86cb5ac23b7323a2e7a5e (patch)
tree49d96d0ffb22b181dbde9e9b33a37a48b7634fd6
parentf76652038e1dc218c68dd10774595cb866e1b230 (diff)
downloadvyatta-cfg-system-027f3ba3c8bc757a9bf86cb5ac23b7323a2e7a5e.tar.gz
vyatta-cfg-system-027f3ba3c8bc757a9bf86cb5ac23b7323a2e7a5e.zip
updated fix for bug 6919: Console settings don't support hvc0 for xen
-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 56191819..68ee5724 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]+$ || ^hvc[0-9]+" \
+syntax:expression: pattern $VAR(@) "^((tty[A-Z])||(hvc))+[0-9]+$" \
; "console $VAR(@): not a valid tty name"