View | Details | Raw Unified | Return to bug 35883
Collapse All | Expand All

(-)a/.gear/rules (+1 lines)
Lines 1-3 Link Here
1
copy: *.init
1
copy: *.init
2
copy: *.service
2
copy: *.service
3
tar.xz: acpid
3
tar.xz: acpid
4
copy?: *.patch
(-)a/acpid.init (-2 / +2 lines)
Lines 14-21 WITHOUT_RC_COMPAT=1 Link Here
14
# Source function library.
14
# Source function library.
15
. /etc/init.d/functions
15
. /etc/init.d/functions
16
16
17
PIDFILE=/var/run/acpid.pid
17
PIDFILE=/run/acpid.pid
18
LOCKFILE=/var/lock/subsys/acpid
18
LOCKFILE=/run/lock/subsys/acpid
19
RETVAL=0
19
RETVAL=0
20
20
21
SourceIfNotEmpty /etc/sysconfig/acpid
21
SourceIfNotEmpty /etc/sysconfig/acpid
(-)a/acpid.spec (-2 / +4 lines)
Lines 1-6 Link Here
1
Name: acpid
1
Name: acpid
2
Version: 2.0.22
2
Version: 2.0.22
3
Release: alt1
3
Release: alt2
4
Epoch: 1
4
Epoch: 1
5
Summary: ACPI kernel daemon and control utility
5
Summary: ACPI kernel daemon and control utility
6
License: GPL
6
License: GPL
Lines 13-18 PreReq: sysvinit-utils Link Here
13
Source0: %name-%version.tar.xz
13
Source0: %name-%version.tar.xz
14
Source1: %name.init
14
Source1: %name.init
15
Source2: %name.service
15
Source2: %name.service
16
Patch: replace_rundir-%version.patch
16
17
17
%description
18
%description
18
The ACPI specification defines power and system management functions
19
The ACPI specification defines power and system management functions
Lines 32-37 Power event config for acpid Link Here
32
33
33
%prep
34
%prep
34
%setup
35
%setup
36
%patch -p2
35
37
36
%build
38
%build
37
%autoreconf
39
%autoreconf
Lines 57-63 __EOF__ Link Here
57
59
58
%post
60
%post
59
if pidof %name >/dev/null 2>&1; then
61
if pidof %name >/dev/null 2>&1; then
60
	[ -f %_var/run/%name.pid ] || pidof %name > %_var/run/%name.pid
62
	[ -f /run/%name.pid ] || pidof %name > /run/%name.pid
61
fi
63
fi
62
%post_service %name
64
%post_service %name
63
65
(-)a/replace_rundir-2.0.22.patch (+113 lines)
Line 0 Link Here
1
diff --git a/acpid/acpi_listen.8 b/acpid/acpi_listen.8
2
index d97efae..413a6b0 100644
3
--- a/acpid/acpi_listen.8
4
+++ b/acpid/acpi_listen.8
5
@@ -19,7 +19,7 @@ Receive up to a maximum number of ACPI events, then exit.
6
 .TP
7
 .BI \-s "\fR, \fP" \--socketfile " filename"
8
 This option changes the name of the UNIX domain socket which \fBacpid\fP opens.
9
-Default is \fI/var/run/acpid.socket\fP.
10
+Default is \fI/run/acpid.socket\fP.
11
 .TP
12
 .BI \-t "\fR, \fP" \--time " seconds"
13
 Listen for the specified time in seconds, before exiting.
14
@@ -32,7 +32,7 @@ Show help and exit.
15
 
16
 .SH FILES
17
 .PD 0
18
-.B /var/run/acpid.socket
19
+.B /run/acpid.socket
20
 .PD
21
 
22
 .SH BUGS
23
diff --git a/acpid/acpid.8 b/acpid/acpid.8
24
index 3a6b047..1e4985d 100644
25
--- a/acpid/acpid.8
26
+++ b/acpid/acpid.8
27
@@ -55,7 +55,7 @@ generate spurious battery events at frequent intervals. The name of
28
 this pseudo-action may be redefined with a commandline option.
29
 .PP
30
 In addition to rule files, \fBacpid\fP also accepts connections on a UNIX
31
-domain socket (\fI/var/run/acpid.socket\fP by default).  Any application may
32
+domain socket (\fI/run/acpid.socket\fP by default).  Any application may
33
 connect to this socket.  Once connected, \fBacpid\fP will send the text of
34
 all ACPI events to the client.  The client has the responsibility of filtering
35
 for messages about which it cares.  \fBacpid\fP will not close the client
36
@@ -120,7 +120,7 @@ This option changes the permissions of the UNIX domain socket to which
37
 .TP
38
 .BI \-s "\fR, \fP" \-\-socketfile " filename"
39
 This option changes the name of the UNIX domain socket which \fBacpid\fP opens.
40
-Default is \fI/var/run/acpid.socket\fP.
41
+Default is \fI/run/acpid.socket\fP.
42
 .TP
43
 .BI \-S "\fR, \fP" \-\-nosocket " filename"
44
 This option tells \fBacpid\fP not to open a UNIX domain socket.  This
45
@@ -129,7 +129,7 @@ overrides the \fI-s\fP option, and negates all other socket options.
46
 .BI \-p "\fR, \fP" \-\-pidfile " filename"
47
 This option tells \fBacpid\fP to use the specified file as its pidfile.  If
48
 the file exists, it will be removed and over-written.
49
-Default is \fI/var/run/acpid.pid\fP.
50
+Default is \fI/run/acpid.pid\fP.
51
 .TP
52
 .BI \-r "\fR, \fP" \-\-dropaction " action"
53
 This option defines the pseudo-action which tells \fBacpid\fP to abort
54
@@ -180,11 +180,11 @@ The script will then shut down the system.
55
 .br
56
 .B /etc/acpi/
57
 .br
58
-.B /var/run/acpid.socket
59
+.B /run/acpid.socket
60
 .br
61
-.B /var/run/acpid.pid
62
+.B /run/acpid.pid
63
 .br
64
-.B /var/lock/acpid
65
+.B /run/lock/acpid
66
 .br
67
 .PD
68
 .SH BUGS
69
diff --git a/acpid/acpid.h b/acpid/acpid.h
70
index 7c88b4e..cdeff83 100644
71
--- a/acpid/acpid.h
72
+++ b/acpid/acpid.h
73
@@ -26,11 +26,11 @@
74
 #define ACPI_PROCDIR 		"/proc/acpi"
75
 #define ACPID_EVENTFILE		ACPI_PROCDIR "/event"
76
 #define ACPID_CONFDIR		"/etc/acpi/events"
77
-#define ACPID_SOCKETFILE	"/var/run/acpid.socket"
78
+#define ACPID_SOCKETFILE	"/run/acpid.socket"
79
 #define ACPID_SOCKETMODE	0666
80
 #define ACPID_CLIENTMAX		256
81
-#define ACPID_PIDFILE		"/var/run/acpid.pid"
82
-#define ACPID_LOCKFILE		"/var/lock/acpid"
83
+#define ACPID_PIDFILE		"/run/acpid.pid"
84
+#define ACPID_LOCKFILE		"/run/lock/acpid"
85
 #define ACPID_MAX_ERRS		5
86
 
87
 /* ??? make these changeable by commandline option? */
88
diff --git a/acpid/samples/powerbtn/powerbtn.sh b/acpid/samples/powerbtn/powerbtn.sh
89
index 39a3d9b..f2927b4 100755
90
--- a/acpid/samples/powerbtn/powerbtn.sh
91
+++ b/acpid/samples/powerbtn/powerbtn.sh
92
@@ -43,7 +43,7 @@ getXconsole() {
93
 }
94
 
95
 # Skip if we are just in the middle of resuming.
96
-test -f /var/lock/acpisleep && exit 0
97
+test -f /run/lock/acpisleep && exit 0
98
 
99
 # If the current X console user is running a power management daemon that
100
 # handles suspend/resume requests, let them handle policy.
101
diff --git a/acpid/samples/powerbtn/powerbtn.sh.old b/acpid/samples/powerbtn/powerbtn.sh.old
102
index e5a3e35..9d149f7 100755
103
--- a/acpid/samples/powerbtn/powerbtn.sh.old
104
+++ b/acpid/samples/powerbtn/powerbtn.sh.old
105
@@ -10,7 +10,7 @@
106
 # Skip if we are in the middle of resuming.  Otherwise we may power down the
107
 # system as it is coming back up.
108
 # See 98-acpi-unlock.sh and 05-acpi-lock.sh in Debian.
109
-test -f /var/lock/acpisleep && exit 0
110
+test -f /run/lock/acpisleep && exit 0
111
 
112
 # If gnome-power-manager, kpowersave or klaptopdaemon are running...
113
 if pidof gnome-power-manager kpowersave > /dev/null ||

Return to bug 35883