diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/op_mode/bridge.py | 6 | ||||
| -rwxr-xr-x | src/op_mode/firewall.py | 2 | ||||
| -rwxr-xr-x | src/services/vyos-hostsd | 3 | 
3 files changed, 5 insertions, 6 deletions
| diff --git a/src/op_mode/bridge.py b/src/op_mode/bridge.py index 5a821a287..d6098c158 100755 --- a/src/op_mode/bridge.py +++ b/src/op_mode/bridge.py @@ -32,7 +32,7 @@ def _get_json_data():      """      Get bridge data format JSON      """ -    return cmd(f'sudo bridge --json link show') +    return cmd(f'bridge --json link show')  def _get_raw_data_summary(): @@ -48,7 +48,7 @@ def _get_raw_data_vlan():      """      :returns dict      """ -    json_data = cmd('sudo bridge --json --compressvlans vlan show') +    json_data = cmd('bridge --json --compressvlans vlan show')      data_dict = json.loads(json_data)      return data_dict @@ -57,7 +57,7 @@ def _get_raw_data_fdb(bridge):      """Get MAC-address for the bridge brX      :returns list      """ -    code, json_data = rc_cmd(f'sudo bridge --json fdb show br {bridge}') +    code, json_data = rc_cmd(f'bridge --json fdb show br {bridge}')      # From iproute2 fdb.c, fdb_show() will only exit(-1) in case of      # non-existent bridge device; raise error.      if code == 255: diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py index 950feb625..46bda5f7e 100755 --- a/src/op_mode/firewall.py +++ b/src/op_mode/firewall.py @@ -63,7 +63,7 @@ def get_config_firewall(conf, name=None, ipv6=False, interfaces=True):                                  get_first_key=True, no_tag_node_value_mangle=True)      if firewall and interfaces:          if name: -            firewall['interface'] = [] +            firewall['interface'] = {}          else:              if 'name' in firewall:                  for fw_name, name_conf in firewall['name'].items(): diff --git a/src/services/vyos-hostsd b/src/services/vyos-hostsd index 9ae7b1ea9..a380f2e66 100755 --- a/src/services/vyos-hostsd +++ b/src/services/vyos-hostsd @@ -406,8 +406,7 @@ def validate_schema(data):  def pdns_rec_control(command): -    # pdns-r process name is NOT equal to the name shown in ps -    if not process_named_running('pdns-r/worker'): +    if not process_named_running('pdns_recursor'):          logger.info(f'pdns_recursor not running, not sending "{command}"')          return | 
