Actually commit the patches
This commit is contained in:
parent
9a32090cc2
commit
7d37aab780
@ -0,0 +1,33 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,27 @@
|
|||||||
|
From 6d243cc3e79fa1b4de4388661c9318d17a3d9d1a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||||
|
Date: Sat, 22 Dec 2018 19:49:47 +0900
|
||||||
|
Subject: [PATCH 4/4] Revert "udevd: configure a child process name for worker
|
||||||
|
processes"
|
||||||
|
|
||||||
|
This reverts commit 49f3ee7e74c714f55aab395c080b1099fc17f7fd.
|
||||||
|
---
|
||||||
|
src/udev/udevd.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
|
||||||
|
index fb8724ea87..ec77bd4a71 100644
|
||||||
|
--- a/src/udev/udevd.c
|
||||||
|
+++ b/src/udev/udevd.c
|
||||||
|
@@ -534,7 +534,7 @@ static int worker_spawn(Manager *manager, struct event *event) {
|
||||||
|
if (r < 0)
|
||||||
|
return log_error_errno(r, "Worker: Failed to enable receiving of device: %m");
|
||||||
|
|
||||||
|
- r = safe_fork("(worker)", FORK_DEATHSIG, &pid);
|
||||||
|
+ r = safe_fork(NULL, FORK_DEATHSIG, &pid);
|
||||||
|
if (r < 0) {
|
||||||
|
event->state = EVENT_QUEUED;
|
||||||
|
return log_error_errno(r, "Failed to fork() worker: %m");
|
||||||
|
--
|
||||||
|
2.19.2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user