]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: include Found state in device dumps 8798/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 26 Apr 2018 08:05:33 +0000 (10:05 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 26 Apr 2018 08:19:27 +0000 (10:19 +0200)
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

src/core/device.c

index 294e79f9b5898d17375b98f23ff8bf529ce3c135..565410fd36149a41a2971d6116eaa1abd1c2d152 100644 (file)
@@ -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) {