From: Lennart Poettering Date: Wed, 12 Apr 2023 12:26:56 +0000 (+0200) Subject: discover-image: bring discover path list up-to-date. X-Git-Tag: v254-rc1~743^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b151e69671c8cb01eba1f7969bf1aa63d9f87eb3;p=thirdparty%2Fsystemd.git discover-image: bring discover path list up-to-date. While merge 3af48a86d99b3117a44bc22258ab4d34d0ba7655 was for a working PR it was based on an older version of git main. Let's catch up with the search path changes from de862276eddbbe76b436213b4d427205356d1886. --- diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c index fac595f0d59..198c975c443 100644 --- a/src/shared/discover-image.c +++ b/src/shared/discover-image.c @@ -79,12 +79,10 @@ static const char* const image_search_path[_IMAGE_CLASS_MAX] = { static const char* const image_search_path_initrd[_IMAGE_CLASS_MAX] = { /* (entries that aren't listed here will get the same search path as for the non initrd-case) */ - [IMAGE_SYSEXT] = "/etc/extensions\0" /* only place symlinks here */ - "/run/extensions\0" /* and here too */ - "/var/lib/extensions\0" /* the main place for images */ - "/usr/local/lib/extensions\0" - "/usr/lib/extensions\0" - "/.extra/sysext\0" /* put sysext picked up by systemd-stub last, since not trusted */ + [IMAGE_SYSEXT] = "/etc/extensions\0" /* only place symlinks here */ + "/run/extensions\0" /* and here too */ + "/var/lib/extensions\0" /* the main place for images */ + "/.extra/sysext\0" /* put sysext picked up by systemd-stub last, since not trusted */ }; static Image *image_free(Image *i) {