emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mdev: ignore events with "$SUBSYSTEM" == "firmware" && "$ACTION" == "remove"

Browse Source 
function                                             old     new   delta
mdev_main                                            665     676     +11
This commit is contained in:
Denis Vlasenko 2009-04-13 02:15:57 +00:00
parent 1d925affa9
commit 1fb26da071
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
util-linux/mdev.c
View File

@ -436,11 +436,10 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
ACTION_RECURSE | ACTION_FOLLOWLINKS, ACTION_RECURSE | ACTION_FOLLOWLINKS,
fileAction, dirAction, temp, 0); fileAction, dirAction, temp, 0);
} else { } else {
char *fw;
char *seq; char *seq;
char *action; char *action;
char *env_path; char *env_path;
char seqbuf[sizeof(int)*3 + 2];
int seqlen = seqlen; /* for compiler */
/* Hotplug: /* Hotplug:
* env ACTION=... DEVPATH=... [SEQNUM=...] mdev * env ACTION=... DEVPATH=... [SEQNUM=...] mdev
@ -451,14 +450,23 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
env_path = getenv("DEVPATH"); env_path = getenv("DEVPATH");
if (!action || !env_path) if (!action || !env_path)
bb_show_usage(); bb_show_usage();
fw = getenv("FIRMWARE");
/* If it exists, does /dev/mdev.seq match $SEQNUM?
* If it does not match, earlier mdev is running
* in parallel, and we need to wait */
seq = getenv("SEQNUM"); seq = getenv("SEQNUM");
if (seq) { if (seq) {
int timeout = 2000 / 32; int timeout = 2000 / 32; /* 2000 msec */
do { do {
int seqlen;
char seqbuf[sizeof(int)*3 + 2];
seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1)); seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
if (seqlen < 0) if (seqlen < 0) {
seq = NULL;
break; break;
}
seqbuf[seqlen] = '\0'; seqbuf[seqlen] = '\0';
if (seqbuf[0] == '\n' /* seed file? */ if (seqbuf[0] == '\n' /* seed file? */
|| strcmp(seq, seqbuf) == 0 /* correct idx? */ || strcmp(seq, seqbuf) == 0 /* correct idx? */
@ -470,19 +478,22 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
} }
snprintf(temp, PATH_MAX, "/sys%s", env_path); snprintf(temp, PATH_MAX, "/sys%s", env_path);
if (!strcmp(action, "remove")) if (strcmp(action, "remove") == 0) {
make_device(temp, 1); /* Ignoring "remove firmware". It was reported
else if (!strcmp(action, "add")) { * to happen and to cause erroneous deletion
* of device nodes. */
if (!fw)
make_device(temp, 1);
}
else if (strcmp(action, "add") == 0) {
make_device(temp, 0); make_device(temp, 0);
if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) { if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
char *fw = getenv("FIRMWARE");
if (fw) if (fw)
load_firmware(fw, temp); load_firmware(fw, temp);
} }
} }
if (seq && seqlen >= 0) { if (seq) {
xopen_xwrite_close("mdev.seq", utoa(xatou(seq) + 1)); xopen_xwrite_close("mdev.seq", utoa(xatou(seq) + 1));
} }
} }