From: Kay Sievers <kay.sievers@suse.de>
Date: Tue, 7 Mar 2006 22:20:10 +0000 (+0100)
Subject: warn about %e, MODALIAS, $modalias
X-Git-Tag: 174~2338
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=79102489260da9f577d7c1fb3665dd95d1596bea;ds=sidebyside

warn about %e, MODALIAS, $modalias
---

diff --git a/udev_rules.c b/udev_rules.c
index 9fa2253e9..1aedb1111 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();
@@ -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) {