X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-device-private.c;h=ee9e297cea2ef21770841f16ec932587c1917eef;hb=a178e7fe90c5f9a4f9f196575102ab6812bb5973;hp=36824a747859896be19e3123351b37027b9b5229;hpb=93a724d3f8afc4b6fe5c7c9642c79df724324ed3;p=elogind.git

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 36824a747..ee9e297ce 100644
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -31,7 +31,7 @@ static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
 	id = udev_device_get_id_filename(dev);
 	if (id == NULL)
 		return;
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/tags/", tag, "/", id, NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/tags/", tag, "/", id, NULL);
 
 	if (add) {
 		int fd;
@@ -115,7 +115,7 @@ int udev_device_update_db(struct udev_device *udev_device)
 		return -1;
 
 	has_info = device_has_info(udev_device);
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/data/", id, NULL);
 
 	/* do not store anything for otherwise empty devices */
 	if (!has_info &&
@@ -134,6 +134,13 @@ int udev_device_update_db(struct udev_device *udev_device)
 		return -1;
 	}
 
+	/*
+	 * set 'sticky' bit to indicate that we should not clean the
+	 * database when we transition from initramfs to the real root
+	 */
+	if (udev_device_get_db_persist(udev_device))
+		fchmod(fileno(f), 01644);
+
 	if (has_info) {
 		size_t devlen = strlen(udev_get_dev_path(udev))+1;
 		struct udev_list_entry *list_entry;
@@ -147,6 +154,8 @@ int udev_device_update_db(struct udev_device *udev_device)
 			fprintf(f, "L:%i\n", udev_device_get_devlink_priority(udev_device));
 		if (udev_device_get_watch_handle(udev_device) >= 0)
 			fprintf(f, "W:%i\n", udev_device_get_watch_handle(udev_device));
+		if (udev_device_get_usec_initialized(udev_device) > 0)
+			fprintf(f, "I:%llu\n", udev_device_get_usec_initialized(udev_device));
 		udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
 			if (!udev_list_entry_get_flags(list_entry))
 				continue;
@@ -174,7 +183,7 @@ int udev_device_delete_db(struct udev_device *udev_device)
 	id = udev_device_get_id_filename(udev_device);
 	if (id == NULL)
 		return -1;
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/data/", id, NULL);
 	unlink(filename);
 	return 0;
 }