chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev-setup: allow a path prefix for use in chroots
[elogind.git]
/
src
/
udev
/
udevd.c
diff --git
a/src/udev/udevd.c
b/src/udev/udevd.c
index ee78b396b7c2d863d7037b621a6dbc6323673219..1bb15d8c9e6c5eda92b986f2f05093e8abd2bd84 100644
(file)
--- a/
src/udev/udevd.c
+++ b/
src/udev/udevd.c
@@
-891,7
+891,6
@@
static int mem_size_mb(void)
static int convert_db(struct udev *udev)
{
char filename[UTIL_PATH_SIZE];
static int convert_db(struct udev *udev)
{
char filename[UTIL_PATH_SIZE];
- FILE *f;
struct udev_enumerate *udev_enumerate;
struct udev_list_entry *list_entry;
struct udev_enumerate *udev_enumerate;
struct udev_list_entry *list_entry;
@@
-907,11
+906,7
@@
static int convert_db(struct udev *udev)
if (access(filename, F_OK) < 0)
return 0;
if (access(filename, F_OK) < 0)
return 0;
- f = fopen("/dev/kmsg", "we");
- if (f != NULL) {
- fprintf(f, "<30>systemd-udevd[%u]: converting old udev database\n", getpid());
- fclose(f);
- }
+ print_kmsg("converting old udev database\n");
udev_enumerate = udev_enumerate_new(udev);
if (udev_enumerate == NULL)
udev_enumerate = udev_enumerate_new(udev);
if (udev_enumerate == NULL)
@@
-1040,14
+1035,17
@@
static void kernel_cmdline_options(struct udev *udev)
else
opt = s;
else
opt = s;
- if (startswith(opt, "udev.log-priority="))
-
udev_set_log_priority(udev, util_log_priority(opt + 18))
;
+ if (startswith(opt, "udev.log-priority="))
{
+
int prio
;
- if (startswith(opt, "udev.children-max="))
+ prio = util_log_priority(opt + 18);
+ log_set_max_level(prio);
+ udev_set_log_priority(udev, prio);
+ } else if (startswith(opt, "udev.children-max=")) {
children_max = strtoul(opt + 18, NULL, 0);
children_max = strtoul(opt + 18, NULL, 0);
-
- if (startswith(opt, "udev.exec-delay="))
+ } else if (startswith(opt, "udev.exec-delay=")) {
exec_delay = strtoul(opt + 16, NULL, 0);
exec_delay = strtoul(opt + 16, NULL, 0);
+ }
free(s);
}
free(s);
}
@@
-1058,7
+1056,6
@@
static void kernel_cmdline_options(struct udev *udev)
int main(int argc, char *argv[])
{
struct udev *udev;
int main(int argc, char *argv[])
{
struct udev *udev;
- FILE *f;
sigset_t mask;
int daemonize = false;
int resolve_names = 1;
sigset_t mask;
int daemonize = false;
int resolve_names = 1;
@@
-1110,7
+1107,7
@@
int main(int argc, char *argv[])
case 'D':
debug = true;
log_set_max_level(LOG_DEBUG);
case 'D':
debug = true;
log_set_max_level(LOG_DEBUG);
- udev_set_log_priority(udev, LOG_
INFO
);
+ udev_set_log_priority(udev, LOG_
DEBUG
);
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
@@
-1158,7
+1155,7
@@
int main(int argc, char *argv[])
mkdir("/run/udev", 0755);
mkdir("/run/udev", 0755);
- dev_setup();
+ dev_setup(
""
);
static_dev_create_from_modules(udev);
/* before opening new files, make sure std{in,out,err} fds are in a sane state */
static_dev_create_from_modules(udev);
/* before opening new files, make sure std{in,out,err} fds are in a sane state */
@@
-1265,11
+1262,7
@@
int main(int argc, char *argv[])
sd_notify(1, "READY=1");
}
sd_notify(1, "READY=1");
}
- f = fopen("/dev/kmsg", "we");
- if (f != NULL) {
- fprintf(f, "<30>systemd-udevd[%u]: starting version " VERSION "\n", getpid());
- fclose(f);
- }
+ print_kmsg("starting version " VERSION "\n");
if (!debug) {
int fd;
if (!debug) {
int fd;
@@
-1493,7
+1486,7
@@
int main(int argc, char *argv[])
worker_kill(udev);
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
worker_kill(udev);
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
- reload =
0
;
+ reload =
false
;
}
/* event has finished */
}
/* event has finished */
@@
-1513,6
+1506,7
@@
int main(int argc, char *argv[])
/* start new events */
if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) {
/* start new events */
if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) {
+ udev_builtin_init(udev);
if (rules == NULL)
rules = udev_rules_new(udev, resolve_names);
if (rules != NULL)
if (rules == NULL)
rules = udev_rules_new(udev, resolve_names);
if (rules != NULL)