summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2006-05-17 19:08:38 +0000
committerRichard Hughes <richard@hughsie.com>2006-05-17 19:08:38 +0000
commitee3f9a545acbdd51b059c1f1a7d35e8a67e933fe (patch)
tree7f5535f04265928d54c17b3bc74ca186561df38d
parentabea65d43fd0945a6f14bd0a979f5c57837d9289 (diff)
2006-05-17 Richard Hughes <richard@hughsie.com>
* .cvsignore: Add this file to keep CVS happy. * pm/power.d/laptop-tools: * Makefile.am: Add this folder and file to make the low power actions easy to add. * pm-powersave: Do not just do hardcoded actions, instead run the scripts in /etc/pm/power.d/ with true and false arguments.
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog13
-rw-r--r--Makefile4
-rwxr-xr-xpm/power.d/laptop-tools58
-rwxr-xr-xsrc/pm-powersave73
5 files changed, 106 insertions, 43 deletions
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..26481d5
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+pm-pmu
diff --git a/ChangeLog b/ChangeLog
index c8e06ad..e577c2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-17 Richard Hughes <richard@hughsie.com>
+
+ * .cvsignore:
+ Add this file to keep CVS happy.
+
+ * pm/power.d/laptop-tools:
+ * Makefile.am:
+ Add this folder and file to make the low power actions easy to add.
+
+ * pm-powersave:
+ Do not just do hardcoded actions, instead run the scripts in
+ /etc/pm/power.d/ with true and false arguments.
+
2006-05-02 Peter Jones <pjones@redhat.com>
* pm-pmu.c: Add a hack for bad system headers.
diff --git a/Makefile b/Makefile
index e71bc23..b60ca6b 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ install: all
install -m 755 -d $(sysconfdir)/pm
install -m 755 -d $(sysconfdir)/pm/hooks
install -m 755 -d $(sysconfdir)/pm/config.d
+ install -m 755 -d $(sysconfdir)/pm/power.d
install -m 644 pm.sysconfig $(sysconfdir)/pm/config
for file in pm/functions* ; do \
@@ -60,6 +61,9 @@ install: all
for file in pm/hooks/* ; do \
install -m 755 $$file $(sysconfdir)/pm/hooks ; \
done
+ for file in pm/power.d/* ; do \
+ install -m 755 $$file $(sysconfdir)/pm/power.d ; \
+ done
tag-archive:
@cvs -Q tag -F $(CVSTAG)
diff --git a/pm/power.d/laptop-tools b/pm/power.d/laptop-tools
new file mode 100755
index 0000000..9624c91
--- /dev/null
+++ b/pm/power.d/laptop-tools
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Values are taken from the laptop-tools package
+# Bart Samwel <bart@samwel.tk>
+
+. /etc/pm/functions
+
+setlowpowermode()
+{
+ # Seconds laptop mode has to to wait after the disk
+ # goes idle before doing a sync.
+ echo $DISK_IDLE_SECS > /proc/sys/vm/laptop_mode
+
+ # Set dirty page values
+ echo $DIRTY_WRITEBACK > /proc/sys/vm/dirty_writeback_centisecs
+ echo $DIRTY_EXPIRE > /proc/sys/vm/dirty_expire_centisecs
+
+ # Dirty synchronous ratio. At this percentage of dirty
+ # pages the process which calls write() does its own writeback.
+ echo $DIRTY_RATIO > /proc/sys/vm/dirty_ratio
+
+ # Allowed dirty background ratio, in percent.
+ # Once DIRTY_RATIO has been exceeded, the kernel will wake pdflush
+ # which will then reduce the amount of dirty memory to
+ # dirty_background_ratio. Set this nice and low, so once some
+ # writeout has commenced, we do a lot of it.
+ echo $DIRTY_BACKGROUND_RATIO > /proc/sys/vm/dirty_background_ratio
+}
+
+if [ ! -w "/proc/sys/vm/" ] ; then
+ # Use the raw kernel sysfs interface
+ echo "You do not have write access to /proc/sys/vm/"
+ exit 1
+fi
+
+case "$1" in
+ true)
+ echo "**SetLowPower ON"
+ DISK_IDLE_SECS=2
+ DIRTY_WRITEBACK=30
+ DIRTY_EXPIRE=30
+ DIRTY_RATIO=60
+ DIRTY_BACKGROUND_RATIO=1
+ setlowpowermode
+ ;;
+ false)
+ echo "**SetLowPower OFF"
+ DISK_IDLE_SECS=0
+ DIRTY_WRITEBACK=500
+ DIRTY_EXPIRE=3000
+ DIRTY_RATIO=40
+ DIRTY_BACKGROUND_RATIO=10
+ setlowpowermode
+ ;;
+ *)
+ ;;
+esac
+
+exit $?
diff --git a/src/pm-powersave b/src/pm-powersave
index ff15d82..5d3638d 100755
--- a/src/pm-powersave
+++ b/src/pm-powersave
@@ -1,55 +1,42 @@
-#!/bin/sh
-
-# Simple low-power-mode script
+#!/bin/bash
+#
+# Simple powersave script
+#
+# Copyright 2006 Red Hat, Inc.
+#
# Based on work from:
# Bill Nottingham <notting@redhat.com>
# Peter Jones <pjones@redhat.com>
# David Zeuthen <davidz@redhat.com>
# Richard Hughes <richard@hughsie.com>
#
-# Values are taken from the laptop-tools package
-# Bart Samwel <bart@samwel.tk>
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+runpowerhooks()
+{
+ files="/etc/pm/power.d/*"
+ for file in $files ; do
+ [ -x $file ] && $file $1
+ done
+}
if [ "$1" == "true" ] ; then
- echo "SetLowPower ON"
- DISK_IDLE_SECS=2
- DIRTY_WRITEBACK=30
- DIRTY_EXPIRE=30
- DIRTY_RATIO=60
- DIRTY_BACKGROUND_RATIO=1
+ runpowerhooks true
elif [ "$1" == "false" ] ; then
- echo "SetLowPower OFF"
- DISK_IDLE_SECS=0
- DIRTY_WRITEBACK=500
- DIRTY_EXPIRE=3000
- DIRTY_RATIO=40
- DIRTY_BACKGROUND_RATIO=10
+ runpowerhooks false
else
- echo "Argument needs to be true or false"
+ echo "Argument needs to be true or false" >&2
exit 1
fi
-
-if [ ! -w "/proc/sys/vm/" ] ; then
- # Use the raw kernel sysfs interface
- echo "You do not have write access to /proc/sys/vm/"
- exit 1
-fi
-
-# Seconds laptop mode has to to wait after the disk
-# goes idle before doing a sync.
-echo $DISK_IDLE_SECS > /proc/sys/vm/laptop_mode
-
-# Set dirty page values
-echo $DIRTY_WRITEBACK > /proc/sys/vm/dirty_writeback_centisecs
-echo $DIRTY_EXPIRE > /proc/sys/vm/dirty_expire_centisecs
-
-# Dirty synchronous ratio. At this percentage of dirty
-# pages the process which calls write() does its own writeback.
-echo $DIRTY_RATIO > /proc/sys/vm/dirty_ratio
-
-# Allowed dirty background ratio, in percent.
-# Once DIRTY_RATIO has been exceeded, the kernel will wake pdflush
-# which will then reduce the amount of dirty memory to
-# dirty_background_ratio. Set this nice and low, so once some
-# writeout has commenced, we do a lot of it.
-echo $DIRTY_BACKGROUND_RATIO > /proc/sys/vm/dirty_background_ratio