summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Ababilov <ilovedevlinux@gmail.com>2011-11-17 09:48:38 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-11-17 11:55:44 -0600
commit260b61e9d87510b869f2b7b8fefd281ea695f88e (patch)
tree063732d35eb3d9248a1ca4d2a8085bf45d525d4b
parent5b1aaf8cc803e9f21f8a0c94236ab5dddba4b2fc (diff)
downloadopenrc-260b61e9d87510b869f2b7b8fefd281ea695f88e.tar.gz
openrc-260b61e9d87510b869f2b7b8fefd281ea695f88e.tar.bz2
openrc-260b61e9d87510b869f2b7b8fefd281ea695f88e.tar.xz
on_ac_power: Fix AC adapter presence recognition
On several machines, a file corresponding to AC adapter can be named ADP1. The on_ac_power script checked for AC*, which does not match ADP1, so the script always considered the adapter to be off. X-Gentoo-Bug: 380933 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=380933
-rwxr-xr-xscripts/on_ac_power8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/on_ac_power b/scripts/on_ac_power
index 3655b83..5dd516f 100755
--- a/scripts/on_ac_power
+++ b/scripts/on_ac_power
@@ -3,14 +3,14 @@
# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
# Exit 0 if on AC power, 1 if not and 255 if we don't know how to work it out
-if [ -f /proc/acpi/ac_adapter/AC*/state ]; then
- cat /proc/acpi/ac_adapter/AC*/state | while read line; do
+if [ -f /proc/acpi/ac_adapter/*/state ]; then
+ cat /proc/acpi/ac_adapter/*/state | while read line; do
case "$line" in
"state:"*"off-line") exit 128;;
esac
done
-elif [ -f /sys/class/power_supply/AC*/online ]; then
- cat /sys/class/power_supply/AC*/online | while read line; do
+elif [ -f /sys/class/power_supply/*/online ]; then
+ cat /sys/class/power_supply/*/online | while read line; do
[ "${line}" = 0 ] && exit 128
done
elif [ -f /proc/pmu/info ]; then