chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use global udev_log variable instead of parameter in run_program
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index 0999b5fa756bfc7b553dd413fa9672ca388dc9be..5ed8e38c98dd3073641ce0c82101e5e69280efd6 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-147,9
+147,9
@@
static int udev_event_process(struct udevd_uevent_msg *msg)
strlcpy(program, name_loop->name, sizeof(program));
udev_rules_apply_format(udev, program, sizeof(program));
strlcpy(program, name_loop->name, sizeof(program));
udev_rules_apply_format(udev, program, sizeof(program));
- if (run_program(program, udev->dev->subsystem, NULL, 0, NULL
,
-
(udev_log_priority >= LOG_INFO))
)
- retval = -1;
+ if (run_program(program, udev->dev->subsystem, NULL, 0, NULL
) != 0)
+
if (!name_loop->ignore_error
)
+
retval = -1;
}
}
}
}
}
}
@@
-258,7
+258,7
@@
static void udev_event_run(struct udevd_uevent_msg *msg)
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
retval = udev_event_process(msg);
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
retval = udev_event_process(msg);
- info("seq %llu finished
", msg->seqnum
);
+ info("seq %llu finished
with %i", msg->seqnum, retval
);
logging_close();
if (retval)
logging_close();
if (retval)