daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Blob Blame History Raw
From 1afb38f39a9b4508533cc1c7262e5fff418cb317 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Mon, 17 May 2021 15:49:08 +0200
Subject: [PATCH] Revert "udev: run link_update() with increased retry count in
 second invocation"

This reverts commit 1f3165bda13c8572c8c31d23c998835c4e2ad8f3.

Related: #1942299
---
 src/udev/udev-event.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index eaec05523b..9004634f65 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -934,13 +934,14 @@ void udev_event_execute_rules(struct udev_event *event,
                 /* (re)write database file */
                 udev_device_tag_index(dev, event->dev_db, true);
                 udev_device_update_db(dev);
-                udev_device_set_is_initialized(dev);
 
                 /* Yes, we run update_devnode() twice, because in the first invocation, that is before update of udev database,
                  * it could happen that two contenders are replacing each other's symlink. Hence we run it again to make sure
                  * symlinks point to devices that claim them with the highest priority. */
                 update_devnode(event);
 
+                udev_device_set_is_initialized(dev);
+
                 event->dev_db = udev_device_unref(event->dev_db);
         }
 }