34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
|
From 1f17a35ef85e943965ffafe2ef6eebd98d6b917a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Sat, 22 Dec 2018 19:39:51 +0900
|
||
|
|
Subject: [PATCH 3/4] Revert "sd-device: ignore bind/unbind events for now"
|
||
|
|
|
||
|
|
This reverts commit 56c886dc7ed5b2bb0882ba85136f4070545bfc1b.
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-device/device-private.c | 9 ---------
|
||
|
|
1 file changed, 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
|
||
|
|
index 01a5aa3d3f..36beb3e7df 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)
|
||
|
|
--
|
||
|
|
2.19.2
|
||
|
|
|