X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules.c;h=09a299f22458a6cde5f4e06fa0e5e6ad9afb2afb;hb=fc8ec932580698a2a4274204029aebb937000c70;hp=9fa2253e96e59afefc4bce2c73d733ec1583e34c;hpb=656ba91ee111308b53938b0f518ccbfadada9aa0;p=elogind.git

diff --git a/udev_rules.c b/udev_rules.c
index 9fa2253e9..09a299f22 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -290,6 +290,12 @@ static int find_free_number(const char *base, const char *devpath)
 	char filename[PATH_SIZE];
 	struct udevice *udev_db;
 	int num = 0;
+	static int warn = 1;
+
+	if (warn) {
+		err("%%e is deprecated, will be removed and is unlikey to work correctly. Don't use it.");
+		warn = 0;
+	}
 
 	/* check if the device already owns a matching name */
 	udev_db = udev_device_init();
@@ -604,7 +610,7 @@ found:
 				snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
 					 udev_root, major(udev->devt), minor(udev->devt));
 				udev->tmp_node[sizeof(udev->tmp_node)-1] = '\0';
-				udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
+				udev_node_mknod(udev, udev->tmp_node, udev->devt, 0600, 0, 0);
 			}
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
@@ -616,6 +622,13 @@ found:
 		case SUBST_MODALIAS:
 			{
 				const char *value;
+				static int warn = 1;
+
+				if (warn) {
+					err("$modalias is deprecated, use $env{MODALIAS} or "
+					    "$sysfs{modalias} instead.");
+					warn = 0;
+				}
 
 				value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
 				if (value != NULL) {
@@ -715,6 +728,12 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 
 	if (rule->modalias.operation != KEY_OP_UNSET) {
 		const char *value;
+		static int warn = 1;
+
+		if (warn) {
+			err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
+			warn = 0;
+		}
 
 		value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
 		if (value == NULL) {