Merge branch 'main' into inode-ref

diff --cc src/core/exec-invoke.c
Simple merge

diff --cc src/core/service.c
Simple merge

diff --cc src/portable/portable.c
Simple merge

diff --cc src/shared/boot-entry.c
Simple merge

diff --cc src/shared/conf-parser.c
Simple merge

diff --cc src/shared/find-esp.c
Simple merge

diff --cc src/shared/tar-util.c
Simple merge

diff --cc src/sysext/sysext.c
Simple merge