[git commit] acpid: only display -p if supported in usage
Denys Vlasenko
vda.linux at googlemail.com
Mon Jun 29 12:11:03 UTC 2020
commit: https://git.busybox.net/busybox/commit/?id=79bd7c3f7b37b3b7f85b982bdb4fb9058d6d3a8c
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Norbert Lange <nolange79 at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
networking/udhcp/dhcpd.c | 2 +-
util-linux/acpid.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 6075689dc..acfdaa8c3 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -46,7 +46,7 @@
#include "dhcpc.h"
#include "dhcpd.h"
-#if ENABLE_PID_FILE_PATH == 1
+#if ENABLE_PID_FILE_PATH
#define PID_FILE_PATH CONFIG_PID_FILE_PATH
#else
#define PID_FILE_PATH "/var/run"
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 95f8150e2..fc8215cce 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -42,7 +42,9 @@
//usage: "\n -c DIR Config directory [/etc/acpi]"
//usage: "\n -e FILE /proc event file [/proc/acpi/event]"
//usage: "\n -l FILE Log file [/var/log/acpid.log]"
-//usage: "\n -p FILE Pid file [/var/run/acpid.pid]"
+//usage: IF_FEATURE_PIDFILE(
+//usage: "\n -p FILE Pid file [" CONFIG_PID_FILE_PATH "/acpid.pid]"
+//usage: )
//usage: "\n -a FILE Action file [/etc/acpid.conf]"
//usage: "\n -M FILE Map file [/etc/acpi.map]"
//usage: IF_FEATURE_ACPID_COMPAT(
More information about the busybox-cvs
mailing list