]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
discover-image: bring discover path list up-to-date.
authorLennart Poettering <lennart@poettering.net>
Wed, 12 Apr 2023 12:26:56 +0000 (14:26 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 12 Apr 2023 12:41:32 +0000 (14:41 +0200)
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.

src/shared/discover-image.c

index fac595f0d59e507d8b8a55e461af33033a836c37..198c975c443c85320c11e5ee7334da9f0fde1c06 100644 (file)
@@ -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) {