packages: acpid/acpid.service, acpid/acpid.spec, acpid/acpid.sysconfig, acp...

Mon Feb 6 17:48:12 CET 2012

Author: baggins                      Date: Mon Feb  6 16:48:12 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 9
- systemd support done properly

---- Files affected:
packages/acpid:
   acpid.service (1.1 -> 1.2) , acpid.spec (1.83 -> 1.84) , acpid.sysconfig (1.13 -> 1.14) , acpid.preconfig (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/acpid/acpid.service
diff -u packages/acpid/acpid.service:1.1 packages/acpid/acpid.service:1.2

--- packages/acpid/acpid.service:1.1	Sun Feb  5 23:23:07 2012
+++ packages/acpid/acpid.service	Mon Feb  6 17:48:07 2012
@@ -3,10 +3,9 @@
 After=syslog.service
 
 [Service]
-EnvironmentFile=/etc/sysconfig/acpid
-ExecStart=/sbin/service acpid start
-ExecStop=/sbin/service acpid stop
-Type=forking
+EnvironmentFile=-/etc/sysconfig/acpid
+ExecStartPre=-/usr/share/acpid/acpid.preconfig
+ExecStart=/usr/sbin/acpid -f $PROGRAM_ARGS
 
 [Install]
 WantedBy=multi-user.target

================================================================
Index: packages/acpid/acpid.spec
diff -u packages/acpid/acpid.spec:1.83 packages/acpid/acpid.spec:1.84
--- packages/acpid/acpid.spec:1.83	Sun Feb  5 23:50:20 2012
+++ packages/acpid/acpid.spec	Mon Feb  6 17:48:07 2012
@@ -13,7 +13,7 @@
 Summary(pl.UTF-8):	Demon zdarzeń ACPI
 Name:		acpid
 Version:	2.0.10
-Release:	8
+Release:	9
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://tedfelix.com/linux/%{name}-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Source7:	%{name}.battery.sh
 Source8:	%{name}.upstart
 Source9:	%{name}.service
+Source10:	%{name}.preconfig
 URL:		http://tedfelix.com/linux/acpid-netlink.html
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
@@ -85,7 +86,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig,init},/var/log} \
-	$RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{systemdunitdir}}
+	$RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{systemdunitdir}} \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -99,6 +101,7 @@
 install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/button.sh
 install -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/battery.sh
 install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}
+install %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 > $RPM_BUILD_ROOT/var/log/acpid
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -121,7 +124,18 @@
 %postun
 %systemd_reload
 
-%triggerpostun -- %{name} < 2.0.10-6
+%triggerpostun -- %{name} < 2.0.10-9
+if [ -f /etc/sysconfig/acpid ]; then
+	. /etc/sysconfig/acpid
+	__PROGRAM_ARGS=
+	[ "$NETLINK" = "yes" ] && __PROGRAM_ARGS="-n"
+	[ -n "$CLIENTMAX" ] && __PROGRAM_ARGS="$__PROGRAM_ARGS -C $CLIENTMAX"
+	[ -z "$__PROGRAM_ARGS" ] && exit 0
+	cp -f /etc/sysconfig/acpid{,.rpmsave}
+	echo >>/etc/sysconfig/acpid
+	echo "# Added by rpm trigger" >>/etc/sysconfig/acpid
+	echo "PROGRAM_ARGS=\"$PROGRAM_ARGS $__PROGRAM_ARGS\"" >>/etc/sysconfig/acpid
+fi
 %systemd_trigger acpid.service
 
 %files
@@ -140,6 +154,7 @@
 %attr(640,root,root) %ghost /var/log/acpid
 %{_mandir}/man8/acpid.8*
 %{_mandir}/man8/acpi_listen.8*
+%attr(755,root,root) %{_datadir}/%{name}/acpid.preconfig
 
 %files policy
 %defattr(644,root,root,755)
@@ -153,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2012/02/06 16:48:07  baggins
+- rel 9
+- systemd support done properly
+
 Revision 1.83  2012/02/05 22:50:20  baggins
 - rel 8
 - package service file

================================================================
Index: packages/acpid/acpid.sysconfig
diff -u packages/acpid/acpid.sysconfig:1.13 packages/acpid/acpid.sysconfig:1.14
--- packages/acpid/acpid.sysconfig:1.13	Tue Mar 23 08:27:25 2010
+++ packages/acpid/acpid.sysconfig	Mon Feb  6 17:48:07 2012
@@ -6,14 +6,14 @@
 # This option changes the maximum number of non-root socket connections which
 # can be made to the acpid socket.
 # Default is 256.
-#CLIENTMAX=256
+#PROGRAM_ARGS="-C 256"
 
 # This option forces acpid to use the Linux kernel input layer and netlink
 # interface for ACPI events.
-#NETLINK=yes
+#PROGRAM_ARGS="-n"
 
 # Extra program arguments passed to acpid commandline
-PROGRAM_ARGS=""
+#PROGRAM_ARGS=""
 
 # Modules to load before starting acpid
 

================================================================
Index: packages/acpid/acpid.preconfig
diff -u /dev/null packages/acpid/acpid.preconfig:1.1
--- /dev/null	Mon Feb  6 17:48:13 2012
+++ packages/acpid/acpid.preconfig	Mon Feb  6 17:48:07 2012
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+[ -f /etc/sysconfig/acpid ] && . /etc/sysconfig/acpid
+
+[ -f /proc/modules ] || exit 0
+
+is_yes() {
+	case "$1" in
+	yes|Yes|YES|true|True|TRUE|on|On|ON|Y|y|1)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+if [ "$MODULES" = "all" ]; then
+	MODULES=$(sed -rn 's#^kernel/(drivers/acpi|drivers/misc/.*_acpi)/([^/]+/)*(.*)\.ko(\.gz)*:.*#\3#p' /lib/modules/$(uname -r)/modules.dep)
+else
+	# assemble from old lists
+	MODULES="$MODULES $LAPTOP_MODULES"
+	MODULES="$MODULES $VARIOUS_MODULES"
+	if is_yes "$ASUS_LAPTOP"; then
+		MODULES="$MODULES asus_acpi"
+	fi
+	if is_yes "$TOSHIBA_LAPTOP"; then
+		MODULES="$MODULES toshiba_acpi"
+	fi
+	if is_yes "$IBM_LAPTOP"; then
+		MODULES="$MODULES ibm_acpi"
+	fi
+	# strip spaces
+	MODULES=$(echo ${MODULES})
+fi
+
+if [ -z "$MODULES" ] && exit 0
+
+# see if the modules are already loaded
+if [ "$(lsmod | grep -E '^('$(echo $MODULES | tr ' ' '|')')\b' | wc -l)" = "$(echo $MODULES | wc -w)" ]; then
+	return
+fi
+
+modprobe --all $MODULES
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.service?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.spec?r1=1.83&r2=1.84&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.sysconfig?r1=1.13&r2=1.14&f=u

