Revert "sd-device: ignore bind/unbind events for now"
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 1 Jan 2019 19:00:14 +0000 (04:00 +0900)
committerMichael Biebl <biebl@debian.org>
Sat, 12 Jan 2019 20:49:44 +0000 (20:49 +0000)
This reverts commit 56c886dc7ed5b2bb0882ba85136f4070545bfc1b.

Fixes #11277 and #11299.

(cherry picked from commit b261494128e60dd3168e0ea961606ec4f39c5739)
(cherry picked from commit ff2145bfe5aac524c5870a295293b8e3cc74e27a)

Gbp-Pq: Name Revert-sd-device-ignore-bind-unbind-events-for-now.patch

src/libsystemd/sd-device/device-private.c

index 01a5aa3d3f6dd1f9afbc0e0b3c780dbd68560878..36beb3e7dfa0a2fe07e8ef95697e9b9b06dbb952 100644 (file)
@@ -326,15 +326,6 @@ 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)