X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=a028c9cac0d53d82d99887c2fb458ebaa5513715;hb=02aee108814e25ef01e25851d664197c8f57265f;hp=176e4e293052e4ced91eadbdd43aec988d78bacf;hpb=47ef94ac5f39db6c5c18be10afe32397a0a8d5cc;p=elogind.git diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 176e4e293..a028c9cac 100644 --- 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]; - FILE *f; 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; - 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) @@ -1058,7 +1053,6 @@ static void kernel_cmdline_options(struct udev *udev) int main(int argc, char *argv[]) { struct udev *udev; - FILE *f; sigset_t mask; int daemonize = false; int resolve_names = 1; @@ -1083,8 +1077,9 @@ int main(int argc, char *argv[]) if (udev == NULL) goto exit; - log_open(); + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); + log_open(); udev_set_log_fn(udev, udev_main_log); log_debug("version %s\n", VERSION); label_init("/dev"); @@ -1264,11 +1259,7 @@ int main(int argc, char *argv[]) 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;