#include "path-util.h"
static const char *arg_type = NULL;
+static const char *arg_load_state = NULL;
static char **arg_property = NULL;
static bool arg_all = false;
static const char *arg_job_mode = "replace";
return (!arg_type || ((dot = strrchr(u->id, '.')) &&
streq(dot+1, arg_type))) &&
- (arg_all || !(streq(u->active_state, "inactive") || u->following[0]) || u->job_id > 0);
+ (!arg_load_state || streq(u->load_state, arg_load_state)) &&
+ (arg_all || !(streq(u->active_state, "inactive")
+ || u->following[0]) || u->job_id > 0);
}
static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
}
if (i->id && arg_transport != TRANSPORT_SSH) {
+ int flags = (arg_lines*OUTPUT_SHOW_ALL |
+ arg_follow*OUTPUT_FOLLOW |
+ !arg_quiet*OUTPUT_WARN_CUTOFF);
printf("\n");
- show_journal_by_unit(i->id, arg_output, 0, i->inactive_exit_timestamp_monotonic, arg_lines, arg_all, arg_follow, !arg_quiet);
+ show_journal_by_unit(i->id, arg_output, 0,
+ i->inactive_exit_timestamp_monotonic,
+ arg_lines, flags);
}
if (i->need_daemon_reload)
return 0;
case 't':
- if (unit_type_from_string(optarg) < 0) {
- log_error("Invalid unit type '%s'.", optarg);
- return -EINVAL;
+ if (unit_type_from_string(optarg) >= 0) {
+ arg_type = optarg;
+ break;
}
- arg_type = optarg;
- break;
-
+ if (unit_load_state_from_string(optarg) >= 0) {
+ arg_load_state = optarg;
+ break;
+ }
+ log_error("Unkown unit type or load state '%s'.",
+ optarg);
+ return -EINVAL;
case 'p': {
char **l;