diff options
Diffstat (limited to 'src/op_mode')
| -rwxr-xr-x | src/op_mode/firewall.py | 3 | ||||
| -rwxr-xr-x | src/op_mode/image_installer.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py index 086536e4e..ac47e3273 100755 --- a/src/op_mode/firewall.py +++ b/src/op_mode/firewall.py @@ -598,6 +598,9 @@ def show_firewall_group(name=None): prefix = 'DA_' if dynamic_type == 'address_group' else 'DA6_' if dynamic_type in firewall['group']['dynamic_group']: for dynamic_name, dynamic_conf in firewall['group']['dynamic_group'][dynamic_type].items(): + if name and name != dynamic_name: + continue + references = find_references(dynamic_type, dynamic_name) row = [dynamic_name, textwrap.fill(dynamic_conf.get('description') or '', 50), dynamic_type + '(dynamic)', '\n'.join(references) or 'N/D'] diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 2660309a5..5d52aabb9 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -491,6 +491,8 @@ def get_cli_kernel_options(config_file: str) -> list: config = ConfigTree(read_file(config_file)) config_dict = loads(config.to_json()) kernel_options = dict_search('system.option.kernel', config_dict) + if kernel_options is None: + kernel_options = {} cmdline_options = [] # XXX: This code path and if statements must be kept in sync with the Kernel |