mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

addons: usercmds: Set environment just like the original ifupdown

Browse Source 
The original ifupdown sets all interface options as IF_<option> environment
variable. Duplicate that behavior for compatibility.
This commit is contained in:
Alex Hermann
2021-04-20 18:42:40 +02:00
parent 038136754c
commit ac645a1a82
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ifupdown2/addons/usercmds.py
View File

@@ -43,13 +43,14 @@ class usercmds(moduleBase):
def _run_command(self, ifaceobj, op): def _run_command(self, ifaceobj, op):
cmd_list = ifaceobj.get_attr_value(op) cmd_list = ifaceobj.get_attr_value(op)
if cmd_list: if cmd_list:
os.environ['IFACE'] = ifaceobj.name if ifaceobj.name else '' env = os.environ | {
os.environ['LOGICAL'] = ifaceobj.name if ifaceobj.name else '' 'LOGICAL': ifaceobj.name if ifaceobj.name else '',
os.environ['METHOD'] = ifaceobj.addr_method if ifaceobj.addr_method else '' 'METHOD': ifaceobj.addr_method if ifaceobj.addr_method else '',
os.environ['ADDRFAM'] = ','.join(ifaceobj.addr_family) if ifaceobj.addr_family else '' 'ADDRFAM': ','.join(ifaceobj.addr_family) if ifaceobj.addr_family else ''
} | ifaceobj.get_env()
for cmd in cmd_list: for cmd in cmd_list:
try: try:
utils.exec_user_command(cmd) utils.exec_user_command(cmd, env=env)
except Exception as e: except Exception as e:
if not self.ignore_error(str(e)): if not self.ignore_error(str(e)):
self.logger.warning('%s: %s %s' % (ifaceobj.name, op, self.logger.warning('%s: %s %s' % (ifaceobj.name, op,

3
ifupdown2/ifupdown/utils.py
View File

@@ -392,11 +392,12 @@ class utils():
return cmd_output_string return cmd_output_string
@classmethod @classmethod
def exec_user_command(cls, cmd, close_fds=False, stdout=True, def exec_user_command(cls, cmd, env=None, close_fds=False, stdout=True,
stdin=None, stderr=subprocess.STDOUT): stdin=None, stderr=subprocess.STDOUT):
cls._log_command_exec(cmd, stdin) cls._log_command_exec(cmd, stdin)
return cls._execute_subprocess(cmd, return cls._execute_subprocess(cmd,
shell=True, shell=True,
env=env,
close_fds=close_fds, close_fds=close_fds,
stdout=stdout, stdout=stdout,
stdin=stdin, stdin=stdin,