summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2019-04-04 13:52:20 +1100
committerJoel Stanley <joel@jms.id.au>2019-04-04 13:28:37 +1030
commite01dcd0974861a2c26eed6a66829a2d0bc5356d7 (patch)
treedc55f958b32cf5ab9d4590349331a484f81f5b1e
parentc5f183f52dd76582a277d7ce9d028e7d3c1ba31b (diff)
downloadbuildroot-e01dcd0974861a2c26eed6a66829a2d0bc5356d7.tar.gz
buildroot-e01dcd0974861a2c26eed6a66829a2d0bc5356d7.zip
package/eudev: Revert change preventing monitor start
Commit b1e47be "libudev-monitor.c: fail to monitor udev if udev is not started" causes an internal check to fail if /dev is mounted on devtmpfs. Revert this change to have the udev monitor work again. See https://github.com/gentoo/eudev/issues/172 for discussion. Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com> Signed-off-by: Joel Stanley <joel@jms.id.au>
-rw-r--r--package/eudev/0004-Revert-libudev-monitor.c-fail-to-monitor-udev-if-ude.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/package/eudev/0004-Revert-libudev-monitor.c-fail-to-monitor-udev-if-ude.patch b/package/eudev/0004-Revert-libudev-monitor.c-fail-to-monitor-udev-if-ude.patch
new file mode 100644
index 0000000000..76e7768915
--- /dev/null
+++ b/package/eudev/0004-Revert-libudev-monitor.c-fail-to-monitor-udev-if-ude.patch
@@ -0,0 +1,33 @@
+From ba25cdd6fb1261ca9063c243df3c6b404d80a454 Mon Sep 17 00:00:00 2001
+From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
+Date: Thu, 4 Apr 2019 11:59:51 +1100
+Subject: [PATCH] Revert "libudev-monitor.c: fail to monitor udev if udev is
+ not started"
+
+If /dev is mounted on devtmpfs then the name_to_handle_at() call in
+udev_has_devtmpfs() will fail because devtmpfs does not support this
+operation, and the monitor will always fail.
+
+This reverts commit b1e47be38259f33e1db18193904575a1ffa21be8.
+
+Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
+---
+ src/libudev/libudev-monitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
+index 614149c62..fe494a4a7 100644
+--- a/src/libudev/libudev-monitor.c
++++ b/src/libudev/libudev-monitor.c
+@@ -186,7 +186,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
+ * We do not set a netlink multicast group here, so the socket
+ * will not receive any messages.
+ */
+- if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 || !udev_has_devtmpfs(udev)) {
++ if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 && !udev_has_devtmpfs(udev)) {
+ log_debug("the udev service seems not to be active, disable the monitor");
+ group = UDEV_MONITOR_NONE;
+ } else
+--
+2.21.0
+
OpenPOWER on IntegriCloud