diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2010-10-29 11:31:25 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2010-10-29 11:31:25 -0700 |
| commit | 34e617ae8bbaf88cdc3b83d11236df62a0fdde58 (patch) | |
| tree | b881d3787a7f3da3de9e04540c9492aada86cf78 | |
| parent | 1345ceb1ce6b2f318a5b246fecac783d9ce37644 (diff) | |
| parent | 5ce7766515b85b0de4bcf8f2e72768ab6eaecca7 (diff) | |
| download | vyatta-cfg-system-34e617ae8bbaf88cdc3b83d11236df62a0fdde58.tar.gz vyatta-cfg-system-34e617ae8bbaf88cdc3b83d11236df62a0fdde58.zip | |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg-system into mendocino
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/system/time-zone/node.def | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ddd4c2a6..a484e9e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.18.4) unstable; urgency=low + + * fix for bug 6388 + + -- An-Cheng Huang <ancheng@vyatta.com> Thu, 28 Oct 2010 18:14:26 -0700 + vyatta-cfg-system (0.18.3) unstable; urgency=low * Don't rename vif and other non-driver interfaces diff --git a/templates/system/time-zone/node.def b/templates/system/time-zone/node.def index fcbad601..ec3b430a 100644 --- a/templates/system/time-zone/node.def +++ b/templates/system/time-zone/node.def @@ -21,7 +21,8 @@ update: LTF="/usr/share/zoneinfo" exit 1 fi delete:expression: "sudo ln -fs /usr/share/zoneinfo/GMT /etc/localtime" -allowed: word=${COMP_WORDS[$COMP_CWORD]} +allowed: shopt -s nullglob + word=${COMP_WORDS[$COMP_CWORD]} if [[ $word == */* ]]; then marr=($(ls -d /usr/share/zoneinfo/$word*)) else |