chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: allow deletion of temporary files from normal fs
[elogind.git]
/
src
/
udev
/
udevd.c
diff --git
a/src/udev/udevd.c
b/src/udev/udevd.c
index a5478a754ed8ab270bf1e0a4c9f533a95ae4b834..b78c18f20a85f930ec7d3fd0308323116bd23bcc 100644
(file)
--- a/
src/udev/udevd.c
+++ b/
src/udev/udevd.c
@@
-807,7
+807,7
@@
static void static_dev_create_from_modules(struct udev *udev)
uname(&kernel);
util_strscpyl(modules, sizeof(modules), ROOTPREFIX "/lib/modules/", kernel.release, "/modules.devname", NULL);
uname(&kernel);
util_strscpyl(modules, sizeof(modules), ROOTPREFIX "/lib/modules/", kernel.release, "/modules.devname", NULL);
- f = fopen(modules, "r");
+ f = fopen(modules, "r
e
");
if (f == NULL)
return;
if (f == NULL)
return;
@@
-845,10
+845,11
@@
static void static_dev_create_from_modules(struct udev *udev)
if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3)
continue;
if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3)
continue;
+ mode = 0600;
if (type == 'c')
if (type == 'c')
- mode = S_IFCHR;
+ mode
|
= S_IFCHR;
else if (type == 'b')
else if (type == 'b')
- mode = S_IFBLK;
+ mode
|
= S_IFBLK;
else
continue;
else
continue;
@@
-870,7
+871,7
@@
static int mem_size_mb(void)
char buf[4096];
long int memsize = -1;
char buf[4096];
long int memsize = -1;
- f = fopen("/proc/meminfo", "r");
+ f = fopen("/proc/meminfo", "r
e
");
if (f == NULL)
return -1;
if (f == NULL)
return -1;
@@
-890,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;
@@
-906,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", "w");
- 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)
@@
-1039,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);
}
@@
-1057,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;
@@
-1082,8
+1080,9
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
if (udev == NULL)
goto exit;
- log_
open(
);
+ log_
set_target(LOG_TARGET_AUTO
);
log_parse_environment();
log_parse_environment();
+ log_open();
udev_set_log_fn(udev, udev_main_log);
log_debug("version %s\n", VERSION);
label_init("/dev");
udev_set_log_fn(udev, udev_main_log);
log_debug("version %s\n", VERSION);
label_init("/dev");
@@
-1263,11
+1262,7
@@
int main(int argc, char *argv[])
sd_notify(1, "READY=1");
}
sd_notify(1, "READY=1");
}
- f = fopen("/dev/kmsg", "w");
- 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;