python: Unify systemd drop-in creation

Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Author: nathanchance

python/lib/setup.py

@@ -216,11 +216,8 @@ def configure_trusted_networking():
         no_s_flag_conf_txt = ('[Service]\n'
                               'ExecStart=\n'
                               'ExecStart=/usr/bin/nm-online -q\n')
-        lib.utils.run([
-            'systemctl', 'edit', '--stdin', '--drop-in', 'no-s-flag',
-            'NetworkManager-wait-online.service'
-        ],
-                      input=no_s_flag_conf_txt)
+        lib.utils.systemd_drop_in('NetworkManager-wait-online.service', 'no-s-flag',
+                                  no_s_flag_conf_txt)
 
 
 def disable_suspend():

python/lib/utils.py

@@ -221,6 +221,11 @@ def run_check_rc_zero(*args, **kwargs):
     return chronic(*args, **kwargs, check=False).returncode == 0
 
 
+def systemd_drop_in(service, drop_in_name, conf_txt):
+    return run0(['systemctl', 'edit', '--stdin', '--drop-in', drop_in_name, service],
+                input=conf_txt)
+
+
 def tg_msg(raw_msg):
     if not (botinfo := Path.home().joinpath('.botinfo')).exists():
         raise FileNotFoundError(f"{botinfo} could not be found!")

python/scripts/sd_nspawn.py

@@ -276,8 +276,6 @@ def _gen_upd_cmd(self):
     def install_files(self):
         lib.utils.request_root('file creation')
 
-        systemctl_edit_cmd = ['systemctl', 'edit', '--stdin']
-
         # Allow containers started as services to access /dev/kvm to run
         # accelerated VMs, which allows avoiding installing QEMU in the host
         # environment. Add /dev/vhost-vsock, /dev/vhost-net, and /dev/vsock if
@@ -293,17 +291,14 @@ def install_files(self):
             kvm_conf_txt_parts = ['[Service]\n'] + [
                 f"DeviceAllow={mount} rw\n" for mount in available_dev_mounts
             ]
-
-            lib.utils.run0([*systemctl_edit_cmd, '--drop-in=kvm', 'systemd-nspawn@.service'],
-                           input=''.join(kvm_conf_txt_parts))
+            lib.utils.systemd_drop_in('systemd-nspawn@.service', 'kvm', ''.join(kvm_conf_txt_parts))
 
         # For Mac Studio, ensure the container only starts once the network is online
         if lib.utils.get_hostname() == 'mac-studio-m1-max':
             network_conf_txt = ('[Unit]\n'
                                 'After=network-online.target\n'
                                 'Wants=network-online.target\n')
-            lib.utils.run0([*systemctl_edit_cmd, '--drop-in=network', 'systemd-nspawn@.service'],
-                           input=network_conf_txt)
+            lib.utils.systemd_drop_in('systemd-nspawn@.service', 'network', network_conf_txt)
 
         # Allow my user to access 'machinectl shell' without authentication
         # rules.d can only be read by root so we need to use sudo to test

python/setup/arch.py

@@ -290,8 +290,7 @@ def enable_reflector():
                               'OnUnitInactiveSec=18h\n'
                               'OnCalendar=*-*-* 06,18:00:00\n'
                               'RandomizedDelaySec=1h\n')
-    lib.utils.run(['systemctl', 'edit', '--stdin', '--drop-in=00-schedule', 'reflector.timer'],
-                  input=reflector_drop_in_text)
+    lib.utils.systemd_drop_in('reflector.timer', '00-schedule', reflector_drop_in_text)
     lib.utils.run(['systemctl', 'daemon-reload'])
 
     lib.setup.systemctl_enable('reflector.timer')