forked from pool/systemd
6a62c05e32
- Add upstream patches as real fixes 0001-activate-fix-fd-leak-in-do_accept.patch 0002-analyze-avoid-a-null-dereference.patch 0003-analyze-fix-mem-leak.patch 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch 0006-bus-unref-buscreds-on-failure.patch 0007-core-fix-a-potential-mem-leak.patch 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch 0009-journal-do-not-leak-mmaps-on-OOM.patch 0010-manager-use-correct-cleanup-function.patch - Intergrate the work of Robert and rename the patch 1068-udev-remove-userspace-firmware-loading-support.patch to 1078-udev-remove-userspace-firmware-loading-support.patch Also add patch 1079-udev-remove-userspace-firmware-loading-support.patch to apply the same change for opensuse 13.2 and above - Add upstream patch 0001-systemctl-allow-to-change-the-default-target-without.patch to allow to override default target without --force (bnc#896664) - Add upstream patches for udev 1068-udev-net_setup_link-export-the-.link-filename-applie.patch 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch 1070-rules-net-setup-link-remove-stray-linebreak.patch 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch 1072-udev-netif_rename-don-t-log-to-kmsg.patch 1073-udev-drop-print_kmsg.patch 1074-udev-fix-copy-paste-error-in-log-message.patch OBS-URL: https://build.opensuse.org/request/show/249581 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=206
54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
From 368082520b25722575783f06879fb5fc2e4c219c Mon Sep 17 00:00:00 2001
|
|
From: Robert Milasan <rmilasan@suse.com>
|
|
Date: Sat, 13 Sep 2014 15:18:37 +0200
|
|
Subject: [PATCH] udev: always resolve correctly database names on 'change'
|
|
event
|
|
|
|
Signed-off-by: Robert Milasan <rmilasan@suse.com>
|
|
---
|
|
src/libudev/libudev-device.c | 2 +-
|
|
src/libudev/libudev-private.h | 1 +
|
|
src/udev/udev-event.c | 1 +
|
|
3 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
|
|
index d61a2ad..2699374 100644
|
|
--- a/src/libudev/libudev-device.c
|
|
+++ b/src/libudev/libudev-device.c
|
|
@@ -161,7 +161,7 @@ _public_ dev_t udev_device_get_devnum(struct udev_device *udev_device)
|
|
return udev_device->devnum;
|
|
}
|
|
|
|
-static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
|
|
+int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
|
|
{
|
|
char num[32];
|
|
|
|
diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
|
|
index 35ea7ba..05a6410 100644
|
|
--- a/src/libudev/libudev-private.h
|
|
+++ b/src/libudev/libudev-private.h
|
|
@@ -59,6 +59,7 @@ uid_t udev_device_get_devnode_uid(struct udev_device *udev_device);
|
|
gid_t udev_device_get_devnode_gid(struct udev_device *udev_device);
|
|
int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
|
|
int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath);
|
|
+int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum);
|
|
int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink);
|
|
void udev_device_cleanup_devlinks_list(struct udev_device *udev_device);
|
|
struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value);
|
|
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
|
|
index e8d6676..2cf0763 100644
|
|
--- a/src/udev/udev-event.c
|
|
+++ b/src/udev/udev-event.c
|
|
@@ -812,6 +812,7 @@ void udev_event_execute_rules(struct udev_event *event,
|
|
if (event->dev_db != NULL) {
|
|
udev_device_set_syspath(event->dev_db, udev_device_get_syspath(dev));
|
|
udev_device_set_subsystem(event->dev_db, udev_device_get_subsystem(dev));
|
|
+ udev_device_set_devnum(event->dev_db, udev_device_get_devnum(dev));
|
|
udev_device_read_db(event->dev_db, NULL);
|
|
udev_device_set_info_loaded(event->dev_db);
|
|
|
|
--
|
|
1.8.4.5
|
|
|