From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sun, 9 Dec 2018 19:59:34 +0000 (-0800)
Subject: sd-device: ignore bind/unbind events for now
X-Git-Tag: v240~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56c886dc7ed5b2bb0882ba85136f4070545bfc1b;p=thirdparty%2Fsystemd.git

sd-device: ignore bind/unbind events for now

Until systemd/udev are ready for the new events and do not flush entire
device state on each new event received, we should ignore them.
---

diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 36beb3e7dfa..01a5aa3d3f6 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -326,6 +326,15 @@ static int device_append(sd_device *device, char *key, const char **_major, cons
                         action = device_action_from_string(value);
                         if (action == _DEVICE_ACTION_INVALID)
                                 return -EINVAL;
+                        /* FIXME: remove once we no longer flush previuos state for each action */
+                        if (action == DEVICE_ACTION_BIND || action == DEVICE_ACTION_UNBIND) {
+                                static bool warned;
+                                if (!warned) {
+                                        log_device_debug(device, "sd-device: ignoring actions 'bind' and 'unbind'");
+                                        warned = true;
+                                }
+                                return -EINVAL;
+                        }
                 } else if (streq(key, "SEQNUM")) {
                         r = safe_atou64(value, &seqnum);
                         if (r < 0)