From a04d085faa6baf3a021b8d795e1a8487f4317d1c Mon Sep 17 00:00:00 2001 From: Ewald van Geffen Date: Sun, 26 Jun 2016 20:40:13 +0200 Subject: T58 "monitor firewall name " does not monitor any firewall-log-entry related to set firewall name enable-default-log --- templates/monitor/firewall/name/node.tag/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]\]" -- cgit v1.2.3 From a34e4f13c9b387c184b4f55d53477b0b33610bd7 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Thu, 15 Sep 2016 12:28:12 +0200 Subject: fix error message "NameError: name 'CalledProcessError' is not defined" when doing a 'show version' on a non virtual machine --- scripts/vyos-show-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 7487f99240d3815cf70d1a016415e2c44ef2a8d3 Mon Sep 17 00:00:00 2001 From: Geoff Adams Date: Tue, 20 Sep 2016 18:25:56 -0700 Subject: Correctly identify ttyS1 as a serial console, as well (issue T146). --- scripts/vyatta-boot-image.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl index 52b4769..6d03865 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[01]/) { $ehash{'term'} = 'serial'; } else { $ehash{'term'} = 'kvm'; -- cgit v1.2.3 From 55915987f745d48fa4b1319888c1edb86963c6ba Mon Sep 17 00:00:00 2001 From: Geoff Adams Date: Mon, 26 Sep 2016 22:18:16 -0700 Subject: Support serial console on any ttyS#. Well, any of the first 10. --- scripts/vyatta-boot-image.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl index 6d03865..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=ttyS[01]/) { + if (/console=tty0.*console=ttyS[0-9]/) { $ehash{'term'} = 'serial'; } else { $ehash{'term'} = 'kvm'; -- cgit v1.2.3