daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
51beaf
From 43c0bcb8b24edb83bc265cdde264e6d2a36d1cea Mon Sep 17 00:00:00 2001
51beaf
From: Michal Sekletar <msekleta@redhat.com>
51beaf
Date: Mon, 17 May 2021 15:49:08 +0200
51beaf
Subject: [PATCH] Revert "udev: run link_update() with increased retry count in
51beaf
 second invocation"
51beaf
51beaf
This reverts commit 1f3165bda13c8572c8c31d23c998835c4e2ad8f3.
51beaf
51beaf
Related: #1963980
51beaf
---
51beaf
 src/udev/udev-event.c | 3 ++-
51beaf
 1 file changed, 2 insertions(+), 1 deletion(-)
51beaf
51beaf
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
51beaf
index eaec05523b..9004634f65 100644
51beaf
--- a/src/udev/udev-event.c
51beaf
+++ b/src/udev/udev-event.c
51beaf
@@ -934,13 +934,14 @@ void udev_event_execute_rules(struct udev_event *event,
51beaf
                 /* (re)write database file */
51beaf
                 udev_device_tag_index(dev, event->dev_db, true);
51beaf
                 udev_device_update_db(dev);
51beaf
-                udev_device_set_is_initialized(dev);
51beaf
 
51beaf
                 /* Yes, we run update_devnode() twice, because in the first invocation, that is before update of udev database,
51beaf
                  * it could happen that two contenders are replacing each other's symlink. Hence we run it again to make sure
51beaf
                  * symlinks point to devices that claim them with the highest priority. */
51beaf
                 update_devnode(event);
51beaf
 
51beaf
+                udev_device_set_is_initialized(dev);
51beaf
+
51beaf
                 event->dev_db = udev_device_unref(event->dev_db);
51beaf
         }
51beaf
 }