Skip to content

Commit 27c9d9b

Browse files
yuwatabluca
authored andcommitted
test-network: drop ExecReload= in networkd.service and udevd.service
Follow-up for 0e07cdb and f843315. (cherry picked from commit 62eaf8d) (cherry picked from commit 21181e2)
1 parent bf159bb commit 27c9d9b

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

test/test-network/systemd-networkd-tests.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,12 @@ def create_unit_dropin(unit, contents):
372372
with open(f'/run/systemd/system/{unit}.d/00-override.conf', mode='w', encoding='utf-8') as f:
373373
f.write('\n'.join(contents))
374374

375-
def create_service_dropin(service, command, reload_command=None, additional_settings=None):
375+
def create_service_dropin(service, command, additional_settings=None):
376376
drop_in = [
377377
'[Service]',
378378
'ExecStart=',
379379
f'ExecStart=!!{valgrind_cmd}{command}',
380380
]
381-
if reload_command:
382-
drop_in += [
383-
'ExecReload=',
384-
f'ExecReload={valgrind_cmd}{reload_command}',
385-
]
386381
if enable_debug:
387382
drop_in += ['Environment=SYSTEMD_LOG_LEVEL=debug']
388383
if asan_options:
@@ -700,7 +695,6 @@ def setUpModule():
700695
save_timezone()
701696

702697
create_service_dropin('systemd-networkd', networkd_bin,
703-
f'{networkctl_bin} reload',
704698
['[Service]', 'Restart=no', '[Unit]', 'StartLimitIntervalSec=0'])
705699
create_service_dropin('systemd-resolved', resolved_bin)
706700
create_service_dropin('systemd-timesyncd', timesyncd_bin)
@@ -714,8 +708,6 @@ def setUpModule():
714708
'[Service]',
715709
'ExecStart=',
716710
f'ExecStart=!!{udevd_bin}',
717-
'ExecReload=',
718-
f'ExecReload={udevadm_bin} control --reload --timeout 0',
719711
]
720712
)
721713
create_unit_dropin(

0 commit comments

Comments
 (0)