I have made the following changes intended for : CE:Adaptation:x86-generic / acpid
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3125 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3125: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-11-18T11:52:47 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: home:sage:branches:CE:Adaptation:x86-generic / acpid -> CE:Adaptation:x86-generic / acpid Index: acpid.changes =================================================================== --- acpid.changes (revision 1) +++ acpid.changes (revision 3) @@ -1,3 +1,8 @@ +* Fri Nov 18 2011 Marko Saukko <[email protected]> - 2.0.10 +- Moved systemd service from sysinit.target to multi-user.target. +- removed unused files storage-fixup-0.2~20090710.tar.bz2, acpid.init, + storage-fixup-for-msi-wind-u100.patc + * Wed Jun 01 2011 Chris Ferron <[email protected]> - 2.0.10 - latest to latest version 2.0.10 while tracking systemd issues. Index: acpid.spec =================================================================== --- acpid.spec (revision 1) +++ acpid.spec (revision 3) @@ -76,8 +76,8 @@ install -D -m 644 %{SOURCE15} $RPM_BUILD_ROOT/%{_lib}/systemd/system/acpid.service install -D -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/acpid -mkdir -p %{buildroot}/%{_lib}/systemd/system/sysinit.target.wants -ln -s ../acpid.service %{buildroot}/%{_lib}/systemd/system/sysinit.target.wants/acpid.service +mkdir -p %{buildroot}/%{_lib}/systemd/system/multi-user.target.wants +ln -s ../acpid.service %{buildroot}/%{_lib}/systemd/system/multi-user.target.wants/acpid.service %post systemctl daemon-reload @@ -102,7 +102,7 @@ %dir %{_sysconfdir}/acpi/battery.d %dir %{_localstatedir}/lib/acpi-support /%{_lib}/systemd/system/acpid.service -/%{_lib}/systemd/system/sysinit.target.wants/acpid.service +/%{_lib}/systemd/system/multi-user.target.wants/acpid.service %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/videoconf %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/powerconf %config(noreplace) %attr(0755,root,root) %{_sysconfdir}/acpi/actions/power.sh Index: acpid.init =================================================================== --- acpid.init (revision 1) +++ acpid.init (deleted) @@ -1,104 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/acpid -# -# Starts the acpi daemon -# -# chkconfig: 3456 26 74 -# description: Listen and dispatch ACPI events from the kernel -# processname: acpid - -### BEGIN INIT INFO -# Provides: acpid -# Required-Start: $syslog $local_fs -# Required-Stop: $syslog $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop acpid -# Description: Listen and dispatch ACPI events from the kernel -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -RETVAL=0 - -# -# See how we were called. -# - -start() { - # Check that we're a privileged user - [ `id -u` = 0 ] || exit 4 - - # Check if acpid is executable - test -x /usr/sbin/acpid || exit 5 - - # Check for kernel support - [ -f /proc/acpi/event ] || exit 1 - - # Check if it is already running - if [ ! -f /var/lock/subsys/acpid ]; then - echo -n $"Starting acpi daemon: " - daemon /usr/sbin/acpid - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid - echo - fi - return $RETVAL -} - -stop() { - echo -n $"Stopping acpi daemon: " - killproc /usr/sbin/acpid - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/acpid - echo - return $RETVAL -} - - -restart() { - stop - start -} - -reload() { - trap "" SIGHUP - action $"Reloading acpi daemon:" killall -HUP acpid - RETVAL=$? - return $RETVAL -} - -case "$1" in -start) - start - ;; -stop) - stop - ;; -reload) - reload - ;; -force-reload) - echo "$0: Unimplemented feature." - RETVAL=3 - ;; -restart) - restart - ;; -condrestart) - if [ -f /var/lock/subsys/acpid ]; then - restart - fi - ;; -status) - status acpid - RETVAL=$? - ;; -*) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" - RETVAL=2 -esac - -exit $RETVAL Index: storage-fixup-0.2~20090710.tar.bz2 =================================================================== Binary files storage-fixup-0.2~20090710.tar.bz2 (revision 1) deleted Index: storage-fixup-for-msi-wind-u100.patch =================================================================== --- storage-fixup-for-msi-wind-u100.patch (revision 1) +++ storage-fixup-for-msi-wind-u100.patch (deleted) @@ -1,30 +0,0 @@ -From 8bcc46eb3b1a6a2760b9a040e9e2ebd36f8b812b Mon Sep 17 00:00:00 2001 -Message-Id: <8bcc46eb3b1a6a2760b9a040e9e2ebd36f8b812b.1247212168.git.yan.i...@intel.com> -From: Yan Li <[email protected]> -Date: Fri, 10 Jul 2009 15:49:01 +0800 -Subject: [PATCH] for MSI Wind U100 - - -Signed-off-by: Yan Li <[email protected]> ---- - storage-fixup.conf | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/storage-fixup.conf b/storage-fixup.conf -index e47d966..03a94e1 100644 ---- a/storage-fixup.conf -+++ b/storage-fixup.conf -@@ -188,3 +188,10 @@ dmi system-manufacturer ASUSTeK Computer Inc. - dmi system-product-name M50SV - ata model WDC WD*BEVE* - act hdparm -B 254 $DEV -+ -+# Reported drive model: WDC WD1600BEVT-22ZCT0 -+rule msi-wind-u100-ms-n011 -+dmi system-manufacturer MICRO-STAR INTERNATIONAL CO., LTD -+dmi system-product-name U-100 -+ata model WDC WD*BEVT* -+act hdparm -B 254 $DEV --- -1.5.6.5 -
