chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: SUSE update
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index fe01d8d4b909b6eef41719f758780b1dabfd8280..0999b5fa756bfc7b553dd413fa9672ca388dc9be 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-76,15
+76,16
@@
void log_message(int priority, const char *format, ...)
if (priority > udev_log_priority)
return;
if (priority > udev_log_priority)
return;
- va_start(args, format);
- vsyslog(priority, format, args);
- va_end(args);
-
if (verbose) {
if (verbose) {
+ printf("[%d] ", (int) getpid());
va_start(args, format);
vprintf(format, args);
va_end(args);
printf("\n");
va_start(args, format);
vprintf(format, args);
va_end(args);
printf("\n");
+ } else {
+ va_start(args, format);
+ vsyslog(priority, format, args);
+ va_end(args);
}
}
}
}
@@
-335,6
+336,7
@@
static int mem_size_mb(void)
}
}
}
}
+ fclose(f);
return memsize;
}
return memsize;
}
@@
-956,7
+958,6
@@
int main(int argc, char *argv[], char *envp[])
selinux_init();
dbg("version %s", UDEV_VERSION);
selinux_init();
dbg("version %s", UDEV_VERSION);
- /* parse commandline options */
while (1) {
option = getopt_long(argc, argv, "dtvhV", options, NULL);
if (option == -1)
while (1) {
option = getopt_long(argc, argv, "dtvhV", options, NULL);
if (option == -1)