diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-11-22 14:43:35 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-11-22 14:43:35 +0100 |
commit | 1c9cd9b71b777bcd23879ac5ad24f391307182c7 (patch) | |
tree | 9b7c3801f0c5a5721bac6b6179fd90270096ae31 | |
parent | 768153bf8cc84a1a53166a9fe538de9484cdc8d1 (diff) | |
download | busybox-w32-1c9cd9b71b777bcd23879ac5ad24f391307182c7.tar.gz busybox-w32-1c9cd9b71b777bcd23879ac5ad24f391307182c7.tar.bz2 busybox-w32-1c9cd9b71b777bcd23879ac5ad24f391307182c7.zip |
mdev: clean up
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | util-linux/mdev.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 66cff6e9c..2cf98b1a4 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -80,18 +80,16 @@ | |||
80 | //kbuild:lib-$(CONFIG_MDEV) += mdev.o | 80 | //kbuild:lib-$(CONFIG_MDEV) += mdev.o |
81 | 81 | ||
82 | //usage:#define mdev_trivial_usage | 82 | //usage:#define mdev_trivial_usage |
83 | //usage: "[-Sv] " IF_FEATURE_MDEV_DAEMON("[") "[-s]" IF_FEATURE_MDEV_DAEMON(" | [-df]]") | 83 | //usage: "[-vS] " IF_FEATURE_MDEV_DAEMON("{ ") "[-s]" IF_FEATURE_MDEV_DAEMON(" | [-df] }") |
84 | //usage:#define mdev_full_usage "\n\n" | 84 | //usage:#define mdev_full_usage "\n\n" |
85 | //usage: "mdev -s is to be run during boot to scan /sys and populate /dev.\n" | 85 | //usage: " -v verbose\n" |
86 | //usage: " -S log to syslog too\n" | ||
87 | //usage: " -s scan /sys and populate /dev\n" | ||
86 | //usage: IF_FEATURE_MDEV_DAEMON( | 88 | //usage: IF_FEATURE_MDEV_DAEMON( |
87 | //usage: "mdev -d[f]: daemon, listen on netlink.\n" | 89 | //usage: " -d daemon, listen on netlink\n" |
88 | //usage: " -f: stay in foreground.\n" | 90 | //usage: " -f stay in foreground\n" |
89 | //usage: ) | 91 | //usage: ) |
90 | //usage: "\n" | 92 | //usage: "\n" |
91 | //usage: "optional arguments:\n" | ||
92 | //usage: " -S: Log to syslog too\n" | ||
93 | //usage: " -v: Increase log verbosity\n" | ||
94 | //usage: "\n" | ||
95 | //usage: "Bare mdev is a kernel hotplug helper. To activate it:\n" | 93 | //usage: "Bare mdev is a kernel hotplug helper. To activate it:\n" |
96 | //usage: " echo /sbin/mdev >/proc/sys/kernel/hotplug\n" | 94 | //usage: " echo /sbin/mdev >/proc/sys/kernel/hotplug\n" |
97 | //usage: IF_FEATURE_MDEV_CONF( | 95 | //usage: IF_FEATURE_MDEV_CONF( |
@@ -1281,7 +1279,9 @@ int mdev_main(int argc UNUSED_PARAM, char **argv) | |||
1281 | 1279 | ||
1282 | #if ENABLE_FEATURE_MDEV_DAEMON | 1280 | #if ENABLE_FEATURE_MDEV_DAEMON |
1283 | if (opt & MDEV_OPT_DAEMON) { | 1281 | if (opt & MDEV_OPT_DAEMON) { |
1284 | // there is no point in write()ing to /dev/null | 1282 | int fd; |
1283 | |||
1284 | /* there is no point in write()ing to /dev/null */ | ||
1285 | if (!(opt & MDEV_OPT_FOREGROUND)) | 1285 | if (!(opt & MDEV_OPT_FOREGROUND)) |
1286 | logmode &= ~LOGMODE_STDIO; | 1286 | logmode &= ~LOGMODE_STDIO; |
1287 | 1287 | ||
@@ -1290,7 +1290,7 @@ int mdev_main(int argc UNUSED_PARAM, char **argv) | |||
1290 | * after initial scan so that caller can be sure everything | 1290 | * after initial scan so that caller can be sure everything |
1291 | * is up-to-date when mdev process returns. | 1291 | * is up-to-date when mdev process returns. |
1292 | */ | 1292 | */ |
1293 | int fd = daemon_init(temp); | 1293 | fd = daemon_init(temp); |
1294 | 1294 | ||
1295 | if (!(opt & MDEV_OPT_FOREGROUND)) | 1295 | if (!(opt & MDEV_OPT_FOREGROUND)) |
1296 | bb_daemonize_or_rexec(0, argv); | 1296 | bb_daemonize_or_rexec(0, argv); |