From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 1 Jan 2019 19:00:14 +0000 (+0900)
Subject: Revert "sd-device: ignore bind/unbind events for now"
X-Git-Tag: archive/raspbian/240-6+rpi1^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a11b229fc6a2f730b1b6812a621666c8a4319e73;p=systemd.git

Revert "sd-device: ignore bind/unbind events for now"

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
---

diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 01a5aa3d..36beb3e7 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -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)