From: Daan De Meyer Date: Tue, 6 Sep 2022 12:26:57 +0000 (+0200) Subject: repart: Invert no_dropin_files boolean X-Git-Tag: v252-rc1~231^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ab44dbdac82b2b2eed7579a08a6d94d02cfe416;p=thirdparty%2Fsystemd.git repart: Invert no_dropin_files boolean --- diff --git a/src/partition/repart.c b/src/partition/repart.c index d3d63ba5b10..29524c205ee 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -2043,7 +2043,7 @@ static int context_dump_partitions(Context *context, const char *node) { uint64_t sum_padding = 0, sum_size = 0; int r; const size_t dropin_files_col = 13; - bool no_dropin_files = true; + bool has_dropin_files = false; if ((arg_json_format_flags & JSON_FORMAT_OFF) && context->n_partitions == 0) { log_info("Empty partition table."); @@ -2120,7 +2120,7 @@ static int context_dump_partitions(Context *context, const char *node) { if (r < 0) return table_log_add_error(r); - no_dropin_files = no_dropin_files && strv_isempty(p->drop_in_files); + has_dropin_files = has_dropin_files || !strv_isempty(p->drop_in_files); } if ((arg_json_format_flags & JSON_FORMAT_OFF) && (sum_padding > 0 || sum_size > 0)) { @@ -2149,7 +2149,7 @@ static int context_dump_partitions(Context *context, const char *node) { return table_log_add_error(r); } - if (no_dropin_files) { + if (!has_dropin_files) { r = table_hide_column_from_display(t, dropin_files_col); if (r < 0) return log_error_errno(r, "Failed to set columns to display: %m");