chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: avoid creating /dev/kmsg with fopen() to support CONFIG_PRINTK=n
[elogind.git]
/
src
/
udev
/
udevd.c
diff --git
a/src/udev/udevd.c
b/src/udev/udevd.c
index ee78b396b7c2d863d7037b621a6dbc6323673219..a028c9cac0d53d82d99887c2fb458ebaa5513715 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)
@@
-1058,7
+1053,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;
@@
-1265,11
+1259,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;