X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevmapper.c;h=1fd1215d91d802d495869930629dbfed37c01b49;hp=b3639320aecba713734d247fe2dc93948d9d5dd3;hb=185676316b4bd3192131a5419604a6a9cfd1d3d1;hpb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27

diff --git a/discover/devmapper.c b/discover/devmapper.c
index b363932..1fd1215 100644
--- a/discover/devmapper.c
+++ b/discover/devmapper.c
@@ -40,12 +40,21 @@ static unsigned int get_block_sectors(struct discover_device *device)
 	return sectors;
 }
 
-/* Petitboot's libdm isn't compiled with --enable-udev_sync, so we set
- * empty cookie and flags unconditionally */
+/*
+ * The system's libdm may or may not have udev sync support. Tell libdm
+ * to manage the creation of device nodes itself rather than waiting on udev
+ * to do it
+ */
 static inline int set_cookie(struct dm_task *task, uint32_t *cookie)
 {
+	uint16_t udev_rules = 0;
 	*cookie = 0;
-	return dm_task_set_cookie(task, cookie, 0);
+
+	dm_udev_set_sync_support(0);
+	udev_rules |= DM_UDEV_DISABLE_DM_RULES_FLAG |
+		DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG;
+
+	return dm_task_set_cookie(task, cookie, udev_rules);
 }
 
 static bool snapshot_merge_complete(const char *dm_name)