emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mdev: clear LOGMODE_STDIO only directly before daemonizing

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-11-22 16:35:56 +01:00
parent cb143b9793
commit 03eb6eba43
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util-linux/mdev.c
View File

@ -1279,21 +1279,17 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_MDEV_DAEMON #if ENABLE_FEATURE_MDEV_DAEMON
if (opt & MDEV_OPT_DAEMON) { if (opt & MDEV_OPT_DAEMON) {
int fd; /* Daemon mode listening on uevent netlink socket. Fork away
/* there is no point in write()ing to /dev/null */
if (!(opt & MDEV_OPT_FOREGROUND))
logmode &= ~LOGMODE_STDIO;
/*
* Daemon mode listening on uevent netlink socket. Fork away
* after initial scan so that caller can be sure everything * after initial scan so that caller can be sure everything
* is up-to-date when mdev process returns. * is up-to-date when mdev process returns.
*/ */
fd = daemon_init(temp); int fd = daemon_init(temp);
if (!(opt & MDEV_OPT_FOREGROUND)) if (!(opt & MDEV_OPT_FOREGROUND)) {
/* there is no point in logging to /dev/null */
logmode &= ~LOGMODE_STDIO;
bb_daemonize_or_rexec(0, argv); bb_daemonize_or_rexec(0, argv);
}
daemon_loop(temp, fd); daemon_loop(temp, fd);
} }