acpid: add config file and map file

function                                             old     new   delta
acpid_main                                           434    1137    +703
find_action                                            -     204    +204
f_evt_tab                                              -      48     +48
packed_usage                                       27724   27755     +31
f_act_tab                                              -      16     +16
process_event                                        126       -    -126
------------------------------------------------------------------------------
(add/remove: 3/1 grow/shrink: 2/0 up/down: 1002/-126)         Total: 876 bytes

Signed-off-by: Souf Oued <souf_oued@yahoo.fr>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/include/usage.src.h b/include/usage.src.h
index 2866bdbba..922774674 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -18,21 +18,27 @@
 INSERT
 
 #define acpid_trivial_usage \
-       "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE]..."
+       "[-d] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
 #define acpid_full_usage "\n\n" \
        "Listen to ACPI events and spawn specific helpers on event arrival\n" \
      "\nOptions:" \
-     "\n        -d      Don't daemonize, log to stderr" \
      "\n        -c DIR  Config directory [/etc/acpi]" \
+     "\n        -d      Don't daemonize, (implies -f)" \
      "\n        -e FILE /proc event file [/proc/acpi/event]" \
-     "\n        -l FILE Log file [/var/log/acpid]" \
+     "\n        -f      Run in foreground" \
+     "\n        -l FILE Log file [/var/log/acpid.log]" \
+     "\n        -p FILE Pid file [/var/run/acpid.pid]" \
+     "\n        -a FILE Action file [/etc/acpid.conf]" \
+     "\n        -M FILE Map file [/etc/acpi.map]" \
         IF_FEATURE_ACPID_COMPAT( \
      "\n\nAccept and ignore compatibility options -g -m -s -S -v" \
         )
 
 #define acpid_example_usage \
+       "Without -e option, acpid uses all /dev/input/event* files\n" \
+       "# acpid\n" \
        "# acpid -l /var/log/my-acpi-log\n" \
-       "# acpid -d /dev/input/event*\n"
+       "# acpid -e /proc/acpi/event\n"
 
 #define addgroup_trivial_usage \
        "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"