diff -Naur acpid-1.0.4.orig/acpid.8 acpid-1.0.4/acpid.8 --- acpid-1.0.4.orig/acpid.8 2003-11-17 22:24:58.000000000 +0100 +++ acpid-1.0.4/acpid.8 2006-07-15 06:35:45.000000000 +0200 @@ -47,7 +47,7 @@ .PP .B acpid will log all of it's activities, as well as the stdout and stderr of any -actions to a log file (\fI/var/log/acpid\fP by default). +actions to a log file (\fI/var/log/acpid.log\fP by default). .PP All the default file and directories can be changed with commandline options. .SH OPTIONS @@ -71,7 +71,7 @@ .TP .BI \-l "\fR, \fP" \--logfile " filename" This option changes the log file to which \fBacpid\fP writes. Default is -\fI/var/log/acpid\fP. +\fI/var/log/acpid.log\fP. .TP .BI \-m "\fR, \fP" \--socketmode " mode" This option changes the permissions of the UNIX domain socket to which @@ -112,7 +112,7 @@ .br .B /etc/acpi/ .br -.B /var/log/acpid +.B /var/log/acpid.log .br .B /var/run/acpid.socket .br diff -Naur acpid-1.0.4.orig/acpid.h acpid-1.0.4/acpid.h --- acpid-1.0.4.orig/acpid.h 2001-08-17 20:30:31.000000000 +0200 +++ acpid-1.0.4/acpid.h 2006-07-15 06:35:45.000000000 +0200 @@ -31,7 +31,7 @@ #define ACPI_PROCDIR "/proc/acpi" #define ACPI_EVENTFILE ACPI_PROCDIR "/event" #define ACPI_CONFDIR "/etc/acpi/events" -#define ACPI_LOGFILE "/var/log/acpid" +#define ACPI_LOGFILE "/var/log/acpid.log" #define ACPI_SOCKETFILE "/var/run/acpid.socket" #define ACPI_SOCKETMODE 0666 #define ACPI_MAX_ERRS 5 diff -Naur acpid-1.0.4.orig/default.sh acpid-1.0.4/default.sh --- acpid-1.0.4.orig/default.sh 1970-01-01 01:00:00.000000000 +0100 +++ acpid-1.0.4/default.sh 2005-11-05 06:50:52.000000000 +0100 @@ -0,0 +1,26 @@ +#!/bin/sh +# Default acpi script that takes an entry for all actions + +set $* + +group=${1/\/*/} +action=${1/*\//} +log=/var/log/acpid.log +pri=local0.notice +tag=ACPID + +case "$group" in + button) + case "$action" in + power) logger -p ${pri} -t ${tag} -f ${log} "ACPI power down" + /sbin/init 0 + ;; + *) logger -p ${pri} -t ${tag} -f ${log} "ACPI group $group / action $action is not defined" + ;; + esac + ;; + + *) + logger -p ${pri} -t ${tag} -f ${log} "ACPI group $group / action $action is not defined" + ;; +esac