From ffc43e38a3727d53185c18f83456fd81b0e8af92 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 03:02:50 +0000 Subject: auto-import changelog data from apmd-3.0.2-20.src.rpm 3.0.2-20 - initscript cleanups (#97781) - add amd to RESTORESERVICES (#102365) 3.0.2-19 - add support for laptop_mode in apmscript - make LOWPOWER_SERVICES not depend on POWER_SERVICES (#74935) - remove xapm manpage (#77900) - fix soundmodules bogosity (#90592) - fix ordering of network & services (#90512, #85436, ) - own /etc/sysconfig/apm-scripts (#74026) - run anacron with -s (#65689) --- diff --git a/apmd.conf b/apmd.conf index 9220ad4..0a12ef3 100644 --- a/apmd.conf +++ b/apmd.conf @@ -38,13 +38,12 @@ TERMINALBEEP="no" # sound applications as the correct user and on the correct display RESTORESOUND="no" RESTORESOUNDPROGS="no" -SOUNDMODULES="sb uart401 sound soundcore maestro cs4281" # some services might need restarting after a suspend/resume cycle - for # example, named will shut down if all network interfaces go down. # Any valid service (as in "ls /etc/init.d/") can be listed, and will be # restarted if it was running at suspend time. -RESTORESERVICES="named" +RESTORESERVICES="named amd" # I got frequent problems mainly with scsi-pcmcia-cards on the cardbus. Use # PCMCIARESTART="yes" to stop the whole pcmcia-subsystem on a suspend and diff --git a/apmd.init b/apmd.init index bce8abc..51c496e 100755 --- a/apmd.init +++ b/apmd.init @@ -30,6 +30,7 @@ start() { RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apmd echo + return $RETVAL } stop() { @@ -37,19 +38,17 @@ stop() { killproc apmd RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/apmd - /sbin/modprobe -r apm &>/dev/null echo + return $RETVAL } dostatus() { status apmd - RETVAL=$? } restart() { stop start - RETVAL=$? } condrestart() { @@ -74,7 +73,7 @@ case "$1" in condrestart ;; *) - echo "Usage: apmd.init {start|stop|status|restart|reload|condrestart}" + echo $"Usage: apmd {start|stop|status|restart|reload|condrestart}" exit 1 esac diff --git a/apmd.spec b/apmd.spec index 71d36d5..c9b9e8e 100644 --- a/apmd.spec +++ b/apmd.spec @@ -1,7 +1,7 @@ Summary: Advanced Power Management (APM) BIOS utilities for laptops. Name: apmd Version: 3.0.2 -Release: 18 +Release: 20 Source: http://www.worldvisions.ca/~apenwarr/apmd/%{name}-%{version}.tar.bz2 Source1: apmd.init Source2: apmscript @@ -46,7 +46,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/{sysconfig/apm-scripts,rc.d/init.d} install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apmd install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/apm-scripts/ install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apmd -rm -f $RPM_BUILD_ROOT%{_bindir}/xapm +rm -f $RPM_BUILD_ROOT%{_bindir}/xapm $RPM_BUILD_ROOT%{_mandir}/man1/xapm* rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/apmd_proxy %clean @@ -80,9 +80,23 @@ fi %{_libdir}/* %config /etc/rc.d/init.d/apmd %config(noreplace) /etc/sysconfig/apmd +%dir /etc/sysconfig/apm-scripts %config /etc/sysconfig/apm-scripts/* %changelog +* Wed Oct 22 2003 Bill Nottingham 1:3.0.2-20 +- initscript cleanups (#97781) +- add amd to RESTORESERVICES (#102365) + +* Mon May 19 2003 Bill Nottingham 1:3.0.2-19 +- add support for laptop_mode in apmscript +- make LOWPOWER_SERVICES not depend on POWER_SERVICES (#74935) +- remove xapm manpage (#77900) +- fix soundmodules bogosity (#90592) +- fix ordering of network & services (#90512, #85436, ) +- own /etc/sysconfig/apm-scripts (#74026) +- run anacron with -s (#65689) + * Mon Feb 24 2003 Elliot Lee - debuginfo rebuild diff --git a/apmscript b/apmscript index 946c715..a0ac643 100755 --- a/apmscript +++ b/apmscript @@ -1,7 +1,7 @@ #!/bin/bash # # Red Hat APM suspend/resume script -# $Id: apmscript,v 1.9 2003/02/21 01:05:59 notting Exp $ +# $Id: apmscript,v 1.17 2003/10/22 21:08:00 notting Exp $ # (c) 1999-2002 Bernhard Rosenkraenzer # (c) 2003 Red Hat, Inc. # @@ -21,7 +21,8 @@ PROG="$1" LOCKFILE=/var/lock/subsys/resume -LANG="C" # We're parsing the output of some scripts, better not i18n it +LANG="C" +export NOLOCALE=1 [ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard [ -e /etc/sysconfig/apmd ] && . /etc/sysconfig/apmd [ -e /etc/sysconfig/clock ] && . /etc/sysconfig/clock @@ -45,14 +46,6 @@ case "$PROG" in [ -f /etc/sysconfig/apm-scripts/apmcontinue-pre ] && /etc/sysconfig/apm-scripts/apmcontinue-pre "$@" # Stop services that might break echo "#!/bin/sh" >/var/run/apm-resume-post - if [ -n "$RESTORESERVICES" ]; then - for i in $RESTORESERVICES; do - if /sbin/service $i status &>/dev/null; then - echo "/sbin/service $i start" >>/var/run/apm-resume-post - /sbin/service $i stop &>/dev/null - fi - done - fi # Remove sound progs and modules if requested if [ "$RESTORESOUND" = "yes" -o "$RESTORESOUNDPROGS" = "yes" ]; then # Find all programs using sound and kill them... @@ -119,8 +112,18 @@ case "$PROG" in done echo "touch /var/lock/subsys/network" >>/var/run/apm-resume-post fi - /sbin/service network stop fi + if [ -n "$RESTORESERVICES" ]; then + for i in $RESTORESERVICES; do + if /sbin/service $i status &>/dev/null; then + echo "/sbin/service $i start" >>/var/run/apm-resume-post + /sbin/service $i stop &>/dev/null + fi + done + fi + if [ "$NET_RESTART" = "yes" ] ; then + /sbin/service network stop + fi [ -n "$NEED_NETFS_START" ] && echo "/sbin/service netfs start" >>/var/run/apm-resume-post [ "$PCMCIARESTART" = "yes" ] && { /sbin/cardctl suspend @@ -167,13 +170,8 @@ case "$PROG" in # Unload sound modules if necessary if [ "$RESTORESOUND" = "yes" -o "$RESTORESOUNDPROGS" = "yes" ]; then - # soundoff is from the commercial OSS drivers, don't worry - # if you don't have it. (Nobody sane does ;) ). - [ -x /usr/bin/soundoff ] && /usr/bin/soundoff - [ -x /usr/sbin/soundoff ] && /usr/sbin/soundoff - [ -x /usr/local/bin/soundoff ] && /usr/local/bin/soundoff - [ -x /usr/local/sbin/soundoff ] && /usr/local/sbin/soundoff rm -rf /var/run/apm-soundmodules + SOUNDMODULES=`modprobe -c | awk '/^alias sound-slot/ { print $3 }'` for m in $SOUNDMODULES; do if lsmod | LC_ALL=C grep -q "^$m " &>/dev/null; then rmmod $m @@ -282,9 +280,9 @@ case "$PROG" in # to run it even in battery mode. if [ -x /usr/sbin/anacron ]; then if apm | LC_ALL=C grep -q on-line &>/dev/null; then - /usr/sbin/anacron + /usr/sbin/anacron -s elif test "x$ANACRON_ON_BATTERY" = "xyes"; then - /usr/sbin/anacron + /usr/sbin/anacron -s fi fi @@ -312,7 +310,7 @@ case "$PROG" in case $2 in power) # change from performance to powersave or vice versa based - # on whether we're running on batter or ac power + # on whether we're running on battery or ac power if test "x$CPUFREQ" = "xyes"; then if apm | LC_ALL=C grep -q on-line &>/dev/null; then echo -n "0%100%100%performance" > /proc/cpufreq @@ -322,18 +320,20 @@ case "$PROG" in fi # Change from battery power to AC power or vice versa. - if [ -n "$POWER_SERVICES" ]; then - if apm | LC_ALL=C grep -q on-line &>/dev/null; then - what="start" - if [ -n "$LOWPOWER_SERVICES" -a -e /var/run/apmd/LOW_POWER ]; then - rm -f /var/run/apmd/LOW_POWER - for i in $LOWPOWER_SERVICES; do - /sbin/service $i start - done - fi - else - what="stop" + if apm | LC_ALL=C grep -q on-line &>/dev/null; then + [ -f /proc/sys/vm/laptop_mode ] && echo 0 > /proc/sys/vm/laptop_mode + what="start" + if [ -n "$LOWPOWER_SERVICES" -a -e /var/run/apmd/LOW_POWER ]; then + rm -f /var/run/apmd/LOW_POWER + for i in $LOWPOWER_SERVICES; do + /sbin/service $i start + done fi + else + what="stop" + [ -f /proc/sys/vm/laptop_mode ] && echo 1 > /proc/sys/vm/laptop_mode + fi + if [ -n "$POWER_SERVICES" ]; then for i in $POWER_SERVICES; do /sbin/service $i $what done @@ -357,11 +357,13 @@ case "$PROG" in start) # This occurs at system startup - you usually don't need to do # anything here. + [ -f /etc/sysconfig/apm-scripts/apmcontinue-pre ] && /etc/sysconfig/apm-scripts/apmcontinue-pre "$@" [ -f /etc/sysconfig/apm-scripts/apmcontinue ] && . /etc/sysconfig/apm-scripts/apmcontinue $@ ;; stop) # This occurs at system shutdown - you usually don't need to do # anything here. + [ -f /etc/sysconfig/apm-scripts/apmcontinue-pre ] && /etc/sysconfig/apm-scripts/apmcontinue-pre "$@" [ -f /etc/sysconfig/apm-scripts/apmcontinue ] && . /etc/sysconfig/apm-scripts/apmcontinue $@ ;; *)