From: Zbigniew Jędrzejewski-Szmek Date: Thu, 26 Apr 2018 08:05:33 +0000 (+0200) Subject: core: include Found state in device dumps X-Git-Tag: v239~348^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d86c235b84a62dde6dfe99a78cabc5cd9bb369c;p=thirdparty%2Fsystemd.git core: include Found state in device dumps In particular, this confirms that the Found state needs to remain a bit-field: $ systemd-analyze dump |grep 'Found: '|sort |uniq -c 105 Found: found-udev 3 Found: found-udev,found-mount 1 Found: found-udev,found-swap --- diff --git a/src/core/device.c b/src/core/device.c index 294e79f9b58..565410fd361 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -273,14 +273,19 @@ static int device_deserialize_item(Unit *u, const char *key, const char *value, static void device_dump(Unit *u, FILE *f, const char *prefix) { Device *d = DEVICE(u); + _cleanup_free_ char *s = NULL; assert(d); + (void) device_found_to_string_many(d->found, &s); + fprintf(f, "%sDevice State: %s\n" - "%sSysfs Path: %s\n", + "%sSysfs Path: %s\n" + "%sFound: %s\n", prefix, device_state_to_string(d->state), - prefix, strna(d->sysfs)); + prefix, strna(d->sysfs), + prefix, strna(s)); } _pure_ static UnitActiveState device_active_state(Unit *u) {