picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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.
This commit is contained in:
kay.sievers@vrfy.org 2003-11-21 06:47:29 -08:00 committed by Greg KH
parent 8f43a65e4f
commit cb08e0f253
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
namedev.c
View File

@ -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,19 +353,19 @@ static int namedev_init_config(void)
/* number type */
dev.type = CALLOUT;
/* PROGRAM="executable" */
retval = get_value("PROGRAM", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.exec_program, temp3);
/* BUS="bus" */
temp2 = strsep(&temp, ",");
retval = get_value("BUS", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.bus, temp3);
/* PROGRAM="executable" */
temp2 = strsep(&temp, ",");
retval = get_value("PROGRAM", &temp, &temp3);
if (retval)
break;
strfieldcpy(dev.exec_program, temp3);
/* ID="id" */
temp2 = strsep(&temp, ",");
retval = get_value("ID", &temp, &temp3);

2
udev.8
View File

@ -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"