mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 16:37:19 +09:00
test-network: drop ExecReload= in networkd.service and udevd.service
Follow-up for0e07cdb0e7andf84331539d.
This commit is contained in:
@@ -357,17 +357,12 @@ def create_unit_dropin(unit, contents):
|
||||
with open(f'/run/systemd/system/{unit}.d/00-override.conf', mode='w', encoding='utf-8') as f:
|
||||
f.write('\n'.join(contents))
|
||||
|
||||
def create_service_dropin(service, command, reload_command=None, additional_settings=None):
|
||||
def create_service_dropin(service, command, additional_settings=None):
|
||||
drop_in = [
|
||||
'[Service]',
|
||||
'ExecStart=',
|
||||
f'ExecStart=!!{valgrind_cmd}{command}',
|
||||
]
|
||||
if reload_command:
|
||||
drop_in += [
|
||||
'ExecReload=',
|
||||
f'ExecReload={valgrind_cmd}{reload_command}',
|
||||
]
|
||||
if enable_debug:
|
||||
drop_in += ['Environment=SYSTEMD_LOG_LEVEL=debug']
|
||||
if asan_options:
|
||||
@@ -688,7 +683,6 @@ def setUpModule():
|
||||
save_timezone()
|
||||
|
||||
create_service_dropin('systemd-networkd', networkd_bin,
|
||||
f'{networkctl_bin} reload',
|
||||
['[Service]', 'Restart=no', '[Unit]', 'StartLimitIntervalSec=0'])
|
||||
create_service_dropin('systemd-resolved', resolved_bin)
|
||||
create_service_dropin('systemd-timesyncd', timesyncd_bin)
|
||||
@@ -702,8 +696,6 @@ def setUpModule():
|
||||
'[Service]',
|
||||
'ExecStart=',
|
||||
f'ExecStart=!!{udevd_bin}',
|
||||
'ExecReload=',
|
||||
f'ExecReload={udevadm_bin} control --reload --timeout 0',
|
||||
]
|
||||
)
|
||||
create_unit_dropin(
|
||||
|
||||
Reference in New Issue
Block a user