WIP: Just a quick hack overlaying systemd from staging-next #10

Draft
dln wants to merge 1 commit from dln/push-tmpsmykrxkvl into main

1 commit