Merge pull request #30480 from keszybz/kernel-install-more-paths

Read kernel-install config from /run/kernel too
2024-03-08 08:25:07 +01:00
parent abcc94b351 b7d62bdbd0
commit ec596fe34e
52 changed files with 482 additions and 298 deletions
@@ -242,21 +242,19 @@ rollback:
        return -ENOMEM;
 }

-int strv_extend_strv_concat(char ***a, char * const *b, const char *suffix) {
+int strv_extend_strv_biconcat(char ***a, const char *prefix, const char* const *b, const char *suffix) {
        int r;

        STRV_FOREACH(s, b) {
                char *v;

-                v = strjoin(*s, suffix);
+                v = strjoin(strempty(prefix), *s, suffix);
                if (!v)
                        return -ENOMEM;

-                r = strv_push(a, v);
-                if (r < 0) {
-                        free(v);
+                r = strv_consume(a, v);
+                if (r < 0)
                        return r;
-                }
        }

        return 0;