diff options
| author | Ron Yorston <rmy@pobox.com> | 2020-07-09 13:10:58 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2020-07-09 13:10:58 +0100 |
| commit | 9c0b2f7020d7c30b21a930ef54be632e092e533b (patch) | |
| tree | b2187c40bd2fd9f49f73599fb08e52cb7a596de0 /util-linux | |
| parent | a8c6e20e332a9e11a9d28cd6770eadb9c9d73cb7 (diff) | |
| parent | d21a63f9fca8eb16f79de9b72d4a3484dfaec1fc (diff) | |
| download | busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.tar.gz busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.tar.bz2 busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/acpid.c | 4 | ||||
| -rw-r--r-- | util-linux/nologin.c | 2 |
2 files changed, 4 insertions, 2 deletions
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 @@ | |||
| 42 | //usage: "\n -c DIR Config directory [/etc/acpi]" | 42 | //usage: "\n -c DIR Config directory [/etc/acpi]" |
| 43 | //usage: "\n -e FILE /proc event file [/proc/acpi/event]" | 43 | //usage: "\n -e FILE /proc event file [/proc/acpi/event]" |
| 44 | //usage: "\n -l FILE Log file [/var/log/acpid.log]" | 44 | //usage: "\n -l FILE Log file [/var/log/acpid.log]" |
| 45 | //usage: "\n -p FILE Pid file [/var/run/acpid.pid]" | 45 | //usage: IF_FEATURE_PIDFILE( |
| 46 | //usage: "\n -p FILE Pid file [" CONFIG_PID_FILE_PATH "/acpid.pid]" | ||
| 47 | //usage: ) | ||
| 46 | //usage: "\n -a FILE Action file [/etc/acpid.conf]" | 48 | //usage: "\n -a FILE Action file [/etc/acpid.conf]" |
| 47 | //usage: "\n -M FILE Map file [/etc/acpi.map]" | 49 | //usage: "\n -M FILE Map file [/etc/acpi.map]" |
| 48 | //usage: IF_FEATURE_ACPID_COMPAT( | 50 | //usage: IF_FEATURE_ACPID_COMPAT( |
diff --git a/util-linux/nologin.c b/util-linux/nologin.c index 5e5e42305..5a8b047a5 100644 --- a/util-linux/nologin.c +++ b/util-linux/nologin.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | //config: | 7 | //config: |
| 8 | //config:config NOLOGIN_DEPENDENCIES | 8 | //config:config NOLOGIN_DEPENDENCIES |
| 9 | //config: bool "Enable dependencies for nologin" | 9 | //config: bool "Enable dependencies for nologin" |
| 10 | //config: default y | 10 | //config: default n # Y default makes it harder to select single-applet test |
| 11 | //config: depends on NOLOGIN | 11 | //config: depends on NOLOGIN |
| 12 | //config: select CAT | 12 | //config: select CAT |
| 13 | //config: select ECHO | 13 | //config: select ECHO |