mkosi.build

@@ -87,16 +87,14 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
         meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D "rootprefix=$rootprefix" -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
 fi
 
-cd "$BUILDDIR"
+ninja -C "$BUILDDIR" all
-ninja
 if [ "$WITH_TESTS" = 1 ] ; then
         for id in 1 2 3; do
-                getent group $id > /dev/null || groupadd -g $id testgroup$id
+                groupadd -g $id testgroup$id || :
         done
 
-        ninja test
+        ninja -C "$BUILDDIR" test
 fi
-cd "$SRCDIR"
 
 # Ubuntu Focal is stuck with meson 0.53.0.
 if [ "$(meson -v | cut -d . -f 2)" -gt 53 ] ; then

src/busctl/busctl.c

@@ -31,7 +31,11 @@
 #include "user-util.h"
 #include "verbs.h"
 
-static JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
+static enum {
+        JSON_OFF,
+        JSON_SHORT,
+        JSON_PRETTY,
+} arg_json = JSON_OFF;
 static PagerFlags arg_pager_flags = 0;
 static bool arg_legend = true;
 static bool arg_full = false;
@@ -63,6 +67,7 @@ STATIC_DESTRUCTOR_REGISTER(arg_matches, strv_freep);
 #define NAME_IS_ACTIVATABLE INT_TO_PTR(2)
 
 static int json_transform_message(sd_bus_message *m, JsonVariant **ret);
+static void json_dump_with_flags(JsonVariant *v, FILE *f);
 
 static int acquire_bus(bool set_monitor, sd_bus **ret) {
         _cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
@@ -357,10 +362,13 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                         return log_error_errno(r, "Failed to fill line: %m");
         }
 
-        if (arg_json_format_flags & (JSON_FORMAT_OFF|JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO))
+        (void) pager_open(arg_pager_flags);
-                (void) pager_open(arg_pager_flags);
 
-        r = table_print_json(table, NULL, arg_json_format_flags);
+        if (arg_json)
+                r = table_print_json(table, stdout,
+                                     (arg_json == JSON_PRETTY ? JSON_FORMAT_PRETTY : JSON_FORMAT_NEWLINE) | JSON_FORMAT_COLOR_AUTO);
+        else
+                r = table_print(table, stdout);
         if (r < 0)
                 return table_log_print_error(r);
 
@@ -1220,7 +1228,7 @@ static int message_json(sd_bus_message *m, FILE *f) {
         if (r < 0)
                 return log_error_errno(r, "Failed to build JSON object: %m");
 
-        json_variant_dump(w, arg_json_format_flags, f, NULL);
+        json_dump_with_flags(w, f);
         return 0;
 }
 
@@ -1347,7 +1355,7 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
 }
 
 static int verb_monitor(int argc, char **argv, void *userdata) {
-        return monitor(argc, argv, (arg_json_format_flags & JSON_FORMAT_OFF) ? message_dump : message_json);
+        return monitor(argc, argv, arg_json != JSON_OFF ? message_json : message_dump);
 }
 
 static int verb_capture(int argc, char **argv, void *userdata) {
@@ -1998,6 +2006,14 @@ static int json_transform_message(sd_bus_message *m, JsonVariant **ret) {
         return 0;
 }
 
+static void json_dump_with_flags(JsonVariant *v, FILE *f) {
+
+        json_variant_dump(v,
+                          (arg_json == JSON_PRETTY ? JSON_FORMAT_PRETTY : JSON_FORMAT_NEWLINE) |
+                          JSON_FORMAT_COLOR_AUTO,
+                          f, NULL);
+}
+
 static int call(int argc, char **argv, void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -2056,17 +2072,17 @@ static int call(int argc, char **argv, void *userdata) {
 
         if (r == 0 && !arg_quiet) {
 
-                if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
+                if (arg_json != JSON_OFF) {
                         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
 
-                        if (arg_json_format_flags & (JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO))
+                        if (arg_json != JSON_SHORT)
                                 (void) pager_open(arg_pager_flags);
 
                         r = json_transform_message(reply, &v);
                         if (r < 0)
                                 return r;
 
-                        json_variant_dump(v, arg_json_format_flags, NULL, NULL);
+                        json_dump_with_flags(v, stdout);
 
                 } else if (arg_verbose) {
                         (void) pager_open(arg_pager_flags);
@@ -2165,17 +2181,17 @@ static int get_property(int argc, char **argv, void *userdata) {
                 if (r < 0)
                         return bus_log_parse_error(r);
 
-                if (!FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
+                if (arg_json != JSON_OFF) {
                         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
 
-                        if (arg_json_format_flags & (JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO))
+                        if (arg_json != JSON_SHORT)
                                 (void) pager_open(arg_pager_flags);
 
                         r = json_transform_variant(reply, contents, &v);
                         if (r < 0)
                                 return r;
 
-                        json_variant_dump(v, arg_json_format_flags, NULL, NULL);
+                        json_dump_with_flags(v, stdout);
 
                 } else if (arg_verbose) {
                         (void) pager_open(arg_pager_flags);
@@ -2527,13 +2543,25 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'j':
-                        arg_json_format_flags = JSON_FORMAT_PRETTY_AUTO|JSON_FORMAT_COLOR_AUTO;
+                        if (on_tty())
+                                arg_json = JSON_PRETTY;
+                        else
+                                arg_json = JSON_SHORT;
                         break;
 
                 case ARG_JSON:
-                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
+                        if (streq(optarg, "short"))
-                        if (r <= 0)
+                                arg_json = JSON_SHORT;
-                                return r;
+                        else if (streq(optarg, "pretty"))
+                                arg_json = JSON_PRETTY;
+                        else if (streq(optarg, "help")) {
+                                fputs("short\n"
+                                      "pretty\n", stdout);
+                                return 0;
+                        } else
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                       "Unknown JSON out mode: %s",
+                                                       optarg);
 
                         break;
 

src/dissect/dissect.c

@@ -45,7 +45,8 @@ static const char *arg_source = NULL;
 static const char *arg_target = NULL;
 static DissectImageFlags arg_flags = DISSECT_IMAGE_REQUIRE_ROOT|DISSECT_IMAGE_DISCARD_ON_LOOP|DISSECT_IMAGE_RELAX_VAR_CHECK|DISSECT_IMAGE_FSCK;
 static VeritySettings arg_verity_settings = VERITY_SETTINGS_DEFAULT;
-static JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
+static bool arg_json = false;
+static JsonFormatFlags arg_json_format_flags = 0;
 
 STATIC_DESTRUCTOR_REGISTER(arg_verity_settings, verity_settings_done);
 
@@ -241,9 +242,22 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_JSON:
-                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
+                        if (streq(optarg, "pretty")) {
-                        if (r <= 0)
+                                arg_json = true;
-                                return r;
+                                arg_json_format_flags = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO;
+                        } else if (streq(optarg, "short")) {
+                                arg_json = true;
+                                arg_json_format_flags = JSON_FORMAT_NEWLINE;
+                        } else if (streq(optarg, "off")) {
+                                arg_json = false;
+                                arg_json_format_flags = 0;
+                        } else if (streq(optarg, "help")) {
+                                puts("pretty\n"
+                                     "short\n"
+                                     "off");
+                                return 0;
+                        } else
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json=: %s", optarg);
 
                         break;
 
@@ -339,17 +353,17 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
         assert(m);
         assert(d);
 
-        if (arg_json_format_flags & JSON_FORMAT_OFF)
+        if (!arg_json)
                 printf("      Name: %s\n", basename(arg_image));
 
         if (ioctl(d->fd, BLKGETSIZE64, &size) < 0)
                 log_debug_errno(errno, "Failed to query size of loopback device: %m");
-        else if (arg_json_format_flags & JSON_FORMAT_OFF) {
+        else if (!arg_json) {
                 char s[FORMAT_BYTES_MAX];
                 printf("      Size: %s\n", format_bytes(s, sizeof(s), size));
         }
 
-        if (arg_json_format_flags & JSON_FORMAT_OFF)
+        if (!arg_json)
                 putc('\n', stdout);
 
         r = dissected_image_acquire_metadata(m);
@@ -365,7 +379,7 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
                 log_warning_errno(r, "OS image is currently in use, proceeding without showing OS image metadata.");
         else if (r < 0)
                 return log_error_errno(r, "Failed to acquire image metadata: %m");
-        else if (arg_json_format_flags & JSON_FORMAT_OFF) {
+        else if (!arg_json) {
                 if (m->hostname)
                         printf("  Hostname: %s\n", m->hostname);
 
@@ -481,11 +495,7 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
                         return table_log_add_error(r);
         }
 
-        if (arg_json_format_flags & JSON_FORMAT_OFF) {
+        if (arg_json) {
-                r = table_print(t, stdout);
-                if (r < 0)
-                        return table_log_print_error(r);
-        } else {
                 _cleanup_(json_variant_unrefp) JsonVariant *jt = NULL;
 
                 r = table_to_json(t, &jt);
@@ -497,6 +507,10 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
                         return log_oom();
 
                 json_variant_dump(v, arg_json_format_flags, stdout, NULL);
+        } else {
+                r = table_print(t, stdout);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to dump table: %m");
         }
 
         return 0;

src/home/homectl.c

@@ -56,7 +56,8 @@ static uint64_t arg_disk_size_relative = UINT64_MAX;
 static char **arg_pkcs11_token_uri = NULL;
 static char **arg_fido2_device = NULL;
 static bool arg_recovery_key = false;
-static JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
+static bool arg_json = false;
+static JsonFormatFlags arg_json_format_flags = 0;
 static bool arg_and_resize = false;
 static bool arg_and_change_password = false;
 static enum {
@@ -170,19 +171,22 @@ static int list_homes(int argc, char *argv[], void *userdata) {
         if (r < 0)
                 return bus_log_parse_error(r);
 
-        if (table_get_rows(table) > 1 || !FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
+        if (table_get_rows(table) > 1 || arg_json) {
                 r = table_set_sort(table, (size_t) 0, (size_t) -1);
                 if (r < 0)
                         return table_log_sort_error(r);
 
                 table_set_header(table, arg_legend);
 
-                r = table_print_json(table, stdout, arg_json_format_flags);
+                if (arg_json)
+                        r = table_print_json(table, stdout, arg_json_format_flags);
+                else
+                        r = table_print(table, NULL);
                 if (r < 0)
                         return table_log_print_error(r);
         }
 
-        if (arg_legend && (arg_json_format_flags & JSON_FORMAT_OFF)) {
+        if (arg_legend && !arg_json) {
                 if (table_get_rows(table) > 1)
                         printf("\n%zu home areas listed.\n", table_get_rows(table) - 1);
                 else
@@ -458,9 +462,7 @@ static void dump_home_record(UserRecord *hr) {
                 log_warning("Warning: lacking rights to acquire privileged fields of user record of '%s', output incomplete.", hr->user_name);
         }
 
-        if (arg_json_format_flags & JSON_FORMAT_OFF)
+        if (arg_json) {
-                user_record_show(hr, true);
-        else {
                 _cleanup_(user_record_unrefp) UserRecord *stripped = NULL;
 
                 if (arg_export_format == EXPORT_FORMAT_STRIPPED)
@@ -475,7 +477,8 @@ static void dump_home_record(UserRecord *hr) {
                         hr = stripped;
 
                 json_variant_dump(hr->json, arg_json_format_flags, stdout, NULL);
-        }
+        } else
+                user_record_show(hr, true);
 }
 
 static char **mangle_user_list(char **list, char ***ret_allocated) {
@@ -3232,13 +3235,27 @@ static int parse_argv(int argc, char *argv[]) {
                 }
 
                 case 'j':
+                        arg_json = true;
                         arg_json_format_flags = JSON_FORMAT_PRETTY_AUTO|JSON_FORMAT_COLOR_AUTO;
                         break;
 
                 case ARG_JSON:
-                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
+                        if (streq(optarg, "pretty")) {
-                        if (r <= 0)
+                                arg_json = true;
-                                return r;
+                                arg_json_format_flags = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO;
+                        } else if (streq(optarg, "short")) {
+                                arg_json = true;
+                                arg_json_format_flags = JSON_FORMAT_NEWLINE;
+                        } else if (streq(optarg, "off")) {
+                                arg_json = false;
+                                arg_json_format_flags = 0;
+                        } else if (streq(optarg, "help")) {
+                                puts("pretty\n"
+                                     "short\n"
+                                     "off");
+                                return 0;
+                        } else
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json=: %s", optarg);
 
                         break;
 
@@ -3250,7 +3267,7 @@ static int parse_argv(int argc, char *argv[]) {
                         else
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Specifying -E more than twice is not supported.");
 
-                        arg_json_format_flags &= ~JSON_FORMAT_OFF;
+                        arg_json = true;
                         if (arg_json_format_flags == 0)
                                 arg_json_format_flags = JSON_FORMAT_PRETTY_AUTO|JSON_FORMAT_COLOR_AUTO;
                         break;

src/partition/repart.c

@@ -106,7 +106,8 @@ static bool arg_randomize = false;
 static int arg_pretty = -1;
 static uint64_t arg_size = UINT64_MAX;
 static bool arg_size_auto = false;
-static JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
+static bool arg_json = false;
+static JsonFormatFlags arg_json_format_flags = 0;
 static void *arg_key = NULL;
 static size_t arg_key_size = 0;
 static char *arg_tpm2_device = NULL;
@@ -1823,7 +1824,7 @@ static int context_dump_partitions(Context *context, const char *node) {
         Partition *p;
         int r;
 
-        if ((arg_json_format_flags & JSON_FORMAT_OFF) && context->n_partitions == 0) {
+        if (!arg_json && context->n_partitions == 0) {
                 log_info("Empty partition table.");
                 return 0;
         }
@@ -1833,12 +1834,12 @@ static int context_dump_partitions(Context *context, const char *node) {
                 return log_oom();
 
         if (!DEBUG_LOGGING) {
-                if (arg_json_format_flags & JSON_FORMAT_OFF)
+                if (arg_json)
-                        (void) table_set_display(t, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4,
-                                                    (size_t) 8, (size_t) 11, (size_t) -1);
-                else
                         (void) table_set_display(t, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4,
                                                     (size_t) 5, (size_t) 6, (size_t) 7, (size_t) 9, (size_t) 10, (size_t) 12, (size_t) -1);
+                else
+                        (void) table_set_display(t, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4,
+                                                    (size_t) 8, (size_t) 11, (size_t) -1);
         }
 
         (void) table_set_align_percent(t, table_get_cell(t, 0, 4), 100);
@@ -1892,7 +1893,7 @@ static int context_dump_partitions(Context *context, const char *node) {
                         return table_log_add_error(r);
         }
 
-        if ((arg_json_format_flags & JSON_FORMAT_OFF) && (sum_padding > 0 || sum_size > 0)) {
+        if (!arg_json && (sum_padding > 0 || sum_size > 0)) {
                 char s[FORMAT_BYTES_MAX];
                 const char *a, *b;
 
@@ -1918,9 +1919,12 @@ static int context_dump_partitions(Context *context, const char *node) {
                         return table_log_add_error(r);
         }
 
-        r = table_print_json(t, stdout, arg_json_format_flags);
+        if (arg_json)
+                r = table_print_json(t, stdout, arg_json_format_flags);
+        else
+                r = table_print(t, stdout);
         if (r < 0)
-                return table_log_print_error(r);
+                return log_error_errno(r, "Failed to dump table: %m");
 
         return 0;
 }
@@ -3199,13 +3203,13 @@ static int context_write_partition_table(
 
         if (arg_pretty > 0 ||
             (arg_pretty < 0 && isatty(STDOUT_FILENO) > 0) ||
-            !FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
+            arg_json) {
 
                 (void) context_dump_partitions(context, node);
 
                 putc('\n', stdout);
 
-                if (arg_json_format_flags & JSON_FORMAT_OFF)
+                if (!arg_json)
                         (void) context_dump_partition_bar(context, node);
                 putc('\n', stdout);
                 fflush(stdout);
@@ -3675,9 +3679,22 @@ static int parse_argv(int argc, char *argv[]) {
                 }
 
                 case ARG_JSON:
-                        r = json_parse_cmdline_parameter_and_warn(optarg, &arg_json_format_flags);
+                        if (streq(optarg, "pretty")) {
-                        if (r <= 0)
+                                arg_json = true;
-                                return r;
+                                arg_json_format_flags = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO;
+                        } else if (streq(optarg, "short")) {
+                                arg_json = true;
+                                arg_json_format_flags = JSON_FORMAT_NEWLINE;
+                        } else if (streq(optarg, "off")) {
+                                arg_json = false;
+                                arg_json_format_flags = 0;
+                        } else if (streq(optarg, "help")) {
+                                puts("pretty\n"
+                                     "short\n"
+                                     "off");
+                                return 0;
+                        } else
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json=: %s", optarg);
 
                         break;
 

src/shared/bpf-program.c

@@ -76,11 +76,6 @@ int bpf_program_load_kernel(BPFProgram *p, char *log_buf, size_t log_size) {
                 return 0;
         }
 
-        // FIXME: Clang doesn't 0-pad with structured initialization, causing
-        // the kernel to reject the bpf_attr as invalid. See:
-        // https://github.com/torvalds/linux/blob/v5.9/kernel/bpf/syscall.c#L65
-        // Ideally it should behave like GCC, so that we can remove these workarounds.
-        zero(attr);
         attr = (union bpf_attr) {
                 .prog_type = p->prog_type,
                 .insns = PTR_TO_UINT64(p->instructions),
@@ -106,7 +101,6 @@ int bpf_program_load_from_bpf_fs(BPFProgram *p, const char *path) {
         if (p->kernel_fd >= 0) /* don't overwrite an assembled or loaded program */
                 return -EBUSY;
 
-        zero(attr);
         attr = (union bpf_attr) {
                 .pathname = PTR_TO_UINT64(path),
         };
@@ -164,7 +158,6 @@ int bpf_program_cgroup_attach(BPFProgram *p, int type, const char *path, uint32_
         if (fd < 0)
                 return -errno;
 
-        zero(attr);
         attr = (union bpf_attr) {
                 .attach_type = type,
                 .target_fd = fd,
@@ -201,7 +194,6 @@ int bpf_program_cgroup_detach(BPFProgram *p) {
         } else {
                 union bpf_attr attr;
 
-                zero(attr);
                 attr = (union bpf_attr) {
                         .attach_type = p->attached_type,
                         .target_fd = fd,

src/shared/format-table.c

@@ -2536,9 +2536,6 @@ int table_print_json(Table *t, FILE *f, JsonFormatFlags flags) {
 
         assert(t);
 
-        if (flags & JSON_FORMAT_OFF) /* If JSON output is turned off, use regular output */
-                return table_print(t, f);
-
         if (!f)
                 f = stdout;
 

src/shared/json.c

@@ -1766,9 +1766,6 @@ int json_variant_format(JsonVariant *v, JsonFormatFlags flags, char **ret) {
         assert_return(v, -EINVAL);
         assert_return(ret, -EINVAL);
 
-        if (flags & JSON_FORMAT_OFF)
-                return -ENOEXEC;
-
         {
                 _cleanup_fclose_ FILE *f = NULL;
 
@@ -4459,27 +4456,6 @@ int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size) {
         return unhexmem(json_variant_string(v), (size_t) -1, ret, ret_size);
 }
 
-int json_parse_cmdline_parameter_and_warn(const char *s, JsonFormatFlags *ret) {
-        assert(s);
-        assert(ret);
-
-        if (streq(s, "pretty"))
-                *ret = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO;
-        else if (streq(s, "short"))
-                *ret = JSON_FORMAT_NEWLINE;
-        else if (streq(s, "off"))
-                *ret = JSON_FORMAT_OFF;
-        else if (streq(s, "help")) {
-                puts("pretty\n"
-                     "short\n"
-                     "off");
-                return 0; /* 0 means → we showed a brief help, exit now */
-        } else
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json= switch: %s", s);
-
-        return 1; /* 1 means → properly parsed */
-}
-
 static const char* const json_variant_type_table[_JSON_VARIANT_TYPE_MAX] = {
         [JSON_VARIANT_STRING] = "string",
         [JSON_VARIANT_INTEGER] = "integer",

src/shared/json.h

@@ -175,7 +175,6 @@ typedef enum JsonFormatFlags {
         JSON_FORMAT_SSE         = 1 << 6, /* prefix/suffix with W3C server-sent events */
         JSON_FORMAT_SEQ         = 1 << 7, /* prefix/suffix with RFC 7464 application/json-seq */
         JSON_FORMAT_FLUSH       = 1 << 8, /* call fflush() after dumping JSON */
-        JSON_FORMAT_OFF         = 1 << 9, /* make json_variant_format() fail with -ENOEXEC */
 } JsonFormatFlags;
 
 int json_variant_format(JsonVariant *v, JsonFormatFlags flags, char **ret);
@@ -357,7 +356,5 @@ int json_log_internal(JsonVariant *variant, int level, int error, const char *fi
 int json_variant_unbase64(JsonVariant *v, void **ret, size_t *ret_size);
 int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size);
 
-int json_parse_cmdline_parameter_and_warn(const char *s, JsonFormatFlags *ret);
-
 const char *json_variant_type_to_string(JsonVariantType t);
 JsonVariantType json_variant_type_from_string(const char *s);

src/shared/machine-image.c

@@ -129,21 +129,17 @@ static int image_new(
         assert(filename);
         assert(ret);
 
-        i = new(Image, 1);
+        i = new0(Image, 1);
         if (!i)
                 return -ENOMEM;
 
-        *i = (Image) {
+        i->n_ref = 1;
-                .n_ref = 1,
+        i->type = t;
-                .type = t,
+        i->read_only = read_only;
-                .read_only = read_only,
+        i->crtime = crtime;
-                .crtime = crtime,
+        i->mtime = mtime;
-                .mtime = mtime,
+        i->usage = i->usage_exclusive = (uint64_t) -1;
-                .usage = UINT64_MAX,
+        i->limit = i->limit_exclusive = (uint64_t) -1;
-                .usage_exclusive = UINT64_MAX,
-                .limit = UINT64_MAX,
-                .limit_exclusive = UINT64_MAX,
-        };
 
         i->name = strdup(pretty);
         if (!i->name)
@@ -236,7 +232,6 @@ static int image_make(
         if (S_ISDIR(st->st_mode)) {
                 _cleanup_close_ int fd = -1;
                 unsigned file_attr = 0;
-                usec_t crtime = 0;
 
                 if (!ret)
                         return 0;
@@ -296,10 +291,8 @@ static int image_make(
                         }
                 }
 
-                /* Get directory creation time (not available everywhere, but that's OK */
+                /* If the IMMUTABLE bit is set, we consider the
-                (void) fd_getcrtime(dfd, &crtime);
+                 * directory read-only. Since the ioctl is not
-
-                /* If the IMMUTABLE bit is set, we consider the directory read-only. Since the ioctl is not
                  * supported everywhere we ignore failures. */
                 (void) read_attr_fd(fd, &file_attr);
 
@@ -309,8 +302,8 @@ static int image_make(
                               path,
                               filename,
                               read_only || (file_attr & FS_IMMUTABLE_FL),
-                              crtime,
+                              0,
-                              0, /* we don't use mtime of stat() here, since it's not the time of last change of the tree, but only of the top-level dir */
+                              0,
                               ret);
                 if (r < 0)
                         return r;

src/test/test-bpf-firewall.c

@@ -37,6 +37,16 @@ int main(int argc, char *argv[]) {
         if (detect_container() > 0)
                 return log_tests_skipped("test-bpf-firewall fails inside LXC and Docker containers: https://github.com/systemd/systemd/issues/9666");
 
+#ifdef __clang__
+        /* FIXME: This test is for (currently unknown) reasons failing in both
+         * sanitized and unsanitized clang runs. Until the issue is resolved,
+         * let's skip the test when running on GH Actions and compiled with
+         * clang.
+         */
+        if (strstr_ptr(ci_environment(), "github-actions"))
+                return log_tests_skipped("Skipping test on GH Actions");
+#endif
+
         assert_se(getrlimit(RLIMIT_MEMLOCK, &rl) >= 0);
         rl.rlim_cur = rl.rlim_max = MAX(rl.rlim_max, CAN_MEMLOCK_SIZE);
         (void) setrlimit(RLIMIT_MEMLOCK, &rl);

src/test/test-xattr-util.c

@@ -28,7 +28,7 @@ static void test_fgetxattrat_fake(void) {
         assert_se(touch(x) >= 0);
 
         r = setxattr(x, "user.foo", "bar", 3, 0);
-        if (r < 0 && ERRNO_IS_NOT_SUPPORTED(errno)) /* no xattrs supported on /var/tmp... */
+        if (r < 0 && errno == EOPNOTSUPP) /* no xattrs supported on /var/tmp... */
                 goto cleanup;
         assert_se(r >= 0);
 
@@ -42,8 +42,7 @@ static void test_fgetxattrat_fake(void) {
         safe_close(fd);
         fd = open("/", O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY);
         assert_se(fd >= 0);
-        r = fgetxattrat_fake(fd, "usr", "user.idontexist", v, 3, 0, &size);
+        assert_se(fgetxattrat_fake(fd, "usr", "user.idontexist", v, 3, 0, &size) == -ENODATA);
-        assert_se(r == -ENODATA || ERRNO_IS_NOT_SUPPORTED(r));
 
 cleanup:
         assert_se(unlink(x) >= 0);

units/meson-add-wants.sh

@@ -1,39 +1,34 @@
 #!/bin/sh
 set -eu
 
-i=1
+unitdir="$1"
-while [ $i -lt $# ] ; do
+target="$2"
-    eval unitdir="\${$i}"
+unit="$3"
-    eval target="\${$((i + 1))}"
-    eval unit="\${$((i + 2))}"
 
-    if [ "${MESON_INSTALL_QUIET:-0}" = 1 ] ; then
+if [ "${MESON_INSTALL_QUIET:-0}" = 1 ] ; then
-        VERBOSE=""
+    VERBOSE=""
-    else
+else
-        VERBOSE="v"
+    VERBOSE="v"
-    fi
+fi
 
-    case "$target" in
+case "$target" in
-        */?*) # a path, but not just a slash at the end
+    */?*) # a path, but not just a slash at the end
-            dir="${DESTDIR:-}${target}"
+        dir="${DESTDIR:-}${target}"
-            ;;
+        ;;
-        *)
+    *)
-            dir="${DESTDIR:-}${unitdir}/${target}"
+        dir="${DESTDIR:-}${unitdir}/${target}"
-            ;;
+        ;;
-    esac
+esac
 
-    unitpath="${DESTDIR:-}${unitdir}/${unit}"
+unitpath="${DESTDIR:-}${unitdir}/${unit}"
 
-    case "$target" in
+case "$target" in
-        */)
+    */)
-            mkdir -${VERBOSE}p -m 0755 "$dir"
+        mkdir -${VERBOSE}p -m 0755 "$dir"
-            ;;
+        ;;
-        *)
+    *)
-            mkdir -${VERBOSE}p -m 0755 "$(dirname "$dir")"
+        mkdir -${VERBOSE}p -m 0755 "$(dirname "$dir")"
-            ;;
+        ;;
-    esac
+esac
 
-    ln -${VERBOSE}fs --relative "$unitpath" "$dir"
+ln -${VERBOSE}fs --relative "$unitpath" "$dir"
-
-    i=$((i + 3))
-done

units/meson.build

@@ -247,8 +247,6 @@ m4_units = [
         ['serial-getty@.service',              ''],
 ]
 
-add_wants = []
-
 foreach tuple : in_units
         file = tuple[0]
 
@@ -272,7 +270,7 @@ foreach tuple : in_units
 
         if install and tuple.length() > 2
                 foreach target : tuple[2].split()
-                        add_wants += [systemunitdir, target, file]
+                        meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file)
                 endforeach
         endif
 endforeach
@@ -297,7 +295,7 @@ foreach tuple : m4_units
 
         if tuple.length() > 2 and install
                 foreach target : tuple[2].split()
-                        add_wants += [systemunitdir, target, file]
+                        meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file)
                 endforeach
         endif
 endforeach
@@ -316,14 +314,13 @@ foreach tuple : units
 
                 if tuple.length() > 2
                         foreach target : tuple[2].split()
-                                add_wants += [systemunitdir, target, file]
+                                meson.add_install_script(
+                                        'meson-add-wants.sh', systemunitdir, target, file)
                         endforeach
                 endif
         endif
 endforeach
 
-meson.add_install_script('meson-add-wants.sh', add_wants)
-
 install_data('user-.slice.d/10-defaults.conf',
              install_dir : systemunitdir + '/user-.slice.d')