From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Fri, 21 Nov 2003 14:47:29 +0000 (-0800)
Subject: [PATCH] namedev.c - change order of fields in CALLOUT
X-Git-Tag: 007~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb08e0f2531f910fcd46a24b2fa0eb8049165b02;p=systemd

[PATCH] namedev.c - change order of fields in CALLOUT

I want to bring the CALLOUT field ordering in line with the other
methods, cause the current parsing relies on the ordering it's good
to have it like the others. The BUS= is now the first expected field.

Also made the last two remaining field names to uppercase and the man page
callout example is updated.
---

diff --git a/namedev.c b/namedev.c
index 41480d50..7c876108 100644
--- a/namedev.c
+++ b/namedev.c
@@ -286,7 +286,7 @@ static int namedev_init_config(void)
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("id", &temp, &temp3);
+			retval = get_value("ID", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.id, temp3);
@@ -314,7 +314,7 @@ static int namedev_init_config(void)
 
 			/* PLACE="place" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("place", &temp, &temp3);
+			retval = get_value("PLACE", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.place, temp3);
@@ -353,18 +353,18 @@ static int namedev_init_config(void)
 			/* number type */
 			dev.type = CALLOUT;
 
-			/* PROGRAM="executable" */
-			retval = get_value("PROGRAM", &temp, &temp3);
+			/* BUS="bus" */
+			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.exec_program, temp3);
+			strfieldcpy(dev.bus, temp3);
 
-			/* BUS="bus" */
+			/* PROGRAM="executable" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("BUS", &temp, &temp3);
+			retval = get_value("PROGRAM", &temp, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.bus, temp3);
+			strfieldcpy(dev.exec_program, temp3);
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
diff --git a/udev.8 b/udev.8
index e46caaf3..079d15f4 100644
--- a/udev.8
+++ b/udev.8
@@ -105,7 +105,7 @@ TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1"
 REPLACE, KERNEL="ttyUSB1", NAME="pda"
 
 # if /sbin/scsi_id returns "OEM 0815" device will be called disk1
-CALLOUT, PROGRAM="/sbin/scsi_id" BUS="scsi", ID="OEM 0815" NAME="disk1"
+CALLOUT, BUS="scsi", PROGRAM="/sbin/scsi_id", ID="OEM 0815", NAME="disk1"
 
 # USB webcams to be called webcam0, webcam1, ...
 LABEL, BUS="usb", model="WebCam Version 3", NAME="webcam%n"