mirror of
https://git.yoctoproject.org/poky
synced 2026-04-01 14:02:23 +02:00
aab0fdf3b7
This fixes handling of units with instance name in theirs filenames such as `gnome-shell@wayland.service` or `gnome-shell@x11.service`. Such files cause template file to be ignored (for the specific instance). Thanks to Markus Volk <f_l_k@t-online.de> for noticing the breakage when building images with gnome-shell: | Error: Systemctl preset_all issue in org.gnome.Shell@wayland.service | WARNING: /home/flk/poky/build/tmp/work/intel_corei7_64-poky-linux/gnome-image/1.0/temp/run.systemd_preset_all.2011511:158 exit 1 from 'systemctl --root="/home/flk/poky/build/tmp/work/intel_corei7_64-poky-linux/gnome-image/1.0/rootfs" --global --preset-mode=enable-only preset-all' The problem manifested after cdc3b3028f6d71788b5fdd99436f69fbf18f613e because we enabled preset-all for user units - org.gnome.Shell@wayland.service is a user service, so prior to that change the file wasn't processed at all. The error was triggered because there is no org.gnome.Shell@.service file. With this patch applied systemctl script looks for instance unit file and falls back to template unit in case of lack thereof, keeping the same behavior upstream systemctl does. (From OE-Core rev: 7eaad7c2a118b3d9db8b694730535afcd3ca985e) Signed-off-by: Artur Kowalski <arturkow2000@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>