diff options
| author | Ewald van Geffen <ewald@abcdef.be> | 2016-12-11 23:14:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 23:14:13 +0100 |
| commit | 0543f228c32ddabd1697fa0221b35018200cf38d (patch) | |
| tree | 460769ff9a897fd6fca16c6b318b2cda07a33a6e | |
| parent | bb2e1e9dbb7bdf153bf43056d64e82d749a3aa81 (diff) | |
| parent | 24fce18b11bc636854ad0c928d162a5a0233afe5 (diff) | |
| download | vyatta-op-0543f228c32ddabd1697fa0221b35018200cf38d.tar.gz vyatta-op-0543f228c32ddabd1697fa0221b35018200cf38d.zip | |
Merge pull request #1 from vyos/current
Update
| -rwxr-xr-x | scripts/vyatta-boot-image.pl | 2 | ||||
| -rw-r--r-- | scripts/vyos-show-version | 2 | ||||
| -rw-r--r-- | templates/monitor/firewall/name/node.tag/node.def | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl index 52b4769..d3ca5e8 100755 --- a/scripts/vyatta-boot-image.pl +++ b/scripts/vyatta-boot-image.pl @@ -102,7 +102,7 @@ sub parseGrubCfg { # old install $ehash{'ver'} = $OLD_IMG_VER_STR; } - if (/console=tty0.*console=ttyS0/) { + if (/console=tty0.*console=ttyS[0-9]/) { $ehash{'term'} = 'serial'; } else { $ehash{'term'} = 'kvm'; diff --git a/scripts/vyos-show-version b/scripts/vyos-show-version index a701b84..c0609ca 100644 --- a/scripts/vyos-show-version +++ b/scripts/vyos-show-version @@ -73,7 +73,7 @@ system_type = "physical" try: hypervisor = subprocess.check_output('hvinfo', shell=True).strip() system_type = "{0} guest".format(hypervisor) -except CalledProcessError: +except subprocess.CalledProcessError: # hvinfo returns 1 if it cannot detect any hypervisor pass version_data['system_type'] = system_type diff --git a/templates/monitor/firewall/name/node.tag/node.def b/templates/monitor/firewall/name/node.tag/node.def index 16b9244..9593cb8 100644 --- a/templates/monitor/firewall/name/node.tag/node.def +++ b/templates/monitor/firewall/name/node.tag/node.def @@ -3,4 +3,4 @@ allowed: local -a ARR eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name))" echo ${ARR[@]} run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \ - ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-[0-9]*-[A,D,R]\]" + ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-([0-9]*|default)-[A,D,R]\]" |