lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

configd / template overwrites, for https://github.com/opnsense/core/issues/1934

Browse Source
This commit is contained in:
Ad Schellevis 2017-11-17 11:46:18 +01:00
parent 14d0ce91a0
commit 42f3e753e2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opnsense/service/modules/template.py
View File

@ -66,15 +66,20 @@ class Template(object):
"""
result = {'+TARGETS': dict(), '+CLEANUP_TARGETS': dict()}
file_path = '%s/%s' % (self._template_dir, module_name.replace('.', '/'))
if os.path.exists('%s/+TARGETS' % file_path):
for line in open('%s/+TARGETS' % file_path, 'r').read().split('\n'):
parts = line.split(':')
if len(parts) > 1 and parts[0].strip()[0] != '#':
result['+TARGETS'][parts[0]] = parts[1].strip()
if len(parts) == 2:
result['+CLEANUP_TARGETS'][parts[0]] = parts[1].strip()
elif parts[2].strip() != "":
result['+CLEANUP_TARGETS'][parts[0]] = parts[2].strip()
for target_source in ['+TARGETS', '+TARGETS.overlay']:
if os.path.exists('%s/%s' % (file_path, target_source)):
for line in open('%s/%s' % (file_path, target_source), 'r').read().split('\n'):
parts = line.split(':')
if len(parts) > 1 and parts[0].strip()[0] != '#':
source_file = parts[0].strip()
target_name = parts[1].strip()
if target_name in result['+TARGETS'].values():
print ('overlay')
result['+TARGETS'][source_file] = target_name
if len(parts) == 2:
result['+CLEANUP_TARGETS'][source_file] = target_name
elif parts[2].strip() != "":
result['+CLEANUP_TARGETS'][source_file] = parts[2].strip()
return result
def list_modules(self):