X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=fac418e526a625099d8b96adec4711b50fd2b3fb;hp=905a1a003840840d5b0924509c5bacf7d7ccab60;hb=e3196993f1f7fdd9fb7fbf4eeb397080554ae920;hpb=46f194cbdecda5a8a0cb4d647b9c74b477a89133

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 905a1a003..fac418e52 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -363,7 +363,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 		    token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode);
 		break;
 	case TK_A_INOTIFY_WATCH:
-		dbg(rules->udev, "%s %u\n", token_str(type), token->key.i);
+		dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch);
 		break;
 	case TK_A_NUM_FAKE_PART:
 		dbg(rules->udev, "%s %u\n", token_str(type), token->key.num_fake_part);
@@ -737,7 +737,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
 {
 	struct udev *udev = udev_device_get_udev(dev);
 	char **envp;
-	char result[2048];
+	char result[4096];
 	size_t reslen;
 	char *line;
 
@@ -1137,8 +1137,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 {
 	char *linepos;
 	char *attr;
-	int physdev = 0;
-	int waitfor = 0;
 	struct rule_tmp rule_tmp;
 
 	memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
@@ -1280,8 +1278,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 				err(rules->udev, "error parsing ENV attribute\n");
 				goto invalid;
 			}
-			if (strncmp(attr, "PHYSDEV", 7) == 0)
-				physdev = 1;
 			if (op < OP_MATCH_MAX) {
 				if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
 					goto invalid;
@@ -1378,7 +1374,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 
 		if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
 			rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
-			waitfor = 1;
 			continue;
 		}
 
@@ -1536,10 +1531,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 		err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
 	}
 
-	if (physdev && !waitfor)
-		err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, "
-		    "please fix it in %s:%u\n", filename, lineno);
-
 	/* add rule token */
 	rule_tmp.rule.rule.token_count = 1 + rule_tmp.token_cur;
 	if (add_token(rules, &rule_tmp.rule) != 0)