Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Dengler <martin@martindengler.com>2009-08-21 22:10:17 (GMT)
committer Martin Dengler <martin@martindengler.com>2009-08-21 22:10:17 (GMT)
commit660b28ea1c98fb81b47e2b2430463910b59d31cd (patch)
treefa5641d3cacfb66b0e75817c3f8392a254156644
parent3aa2d3b91a6f9b721d5eb58b60edd16914e15303 (diff)
fix rtcwake thanks to pgf
-rw-r--r--BUGS.txt3
-rw-r--r--soas-xo.ks19
2 files changed, 10 insertions, 12 deletions
diff --git a/BUGS.txt b/BUGS.txt
index 9d18332..31182e1 100644
--- a/BUGS.txt
+++ b/BUGS.txt
@@ -7,9 +7,6 @@ Caveats/Known Issues:
- SD boots sometimes fail (mount: unknown filesystem type: 'jffs2')
https://bugzilla.redhat.com/show_bug.cgi?id=500196
-- Power management is disabled (XO is configured not to sleep since
- rtcwake never wakes up)
-
Please reply or comment on the Fedora/Redhat bug report if you see any
of these.
diff --git a/soas-xo.ks b/soas-xo.ks
index d1f269b..4f30ce2 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -402,6 +402,13 @@ for service in auditd cpuspeed cups dnsmasq exim firstboot iptables ip6tables ir
/sbin/chkconfig --level 2345 $service off
done
+##################
+# BEGIN configure powerd
+
+#FIXME fix ttyS0 not starting, without which rtcwake is broken
+# see http://lists.sugarlabs.org/archive/sugar-devel/2009-August/018378.html
+sed -i -e 's/start on stopped prefdm/#FIXME when http:\/\/lists.sugarlabs.org\/archive\/sugar-devel\/2009-August\/018378.html is resolved\n#start on stopped prefdm/' /etc/event.d/ttyS0
+
mv /etc/powerd/powerd.conf /etc/powerd/standard.conf
ln -s soas.conf /etc/powerd/powerd.conf
cat > /etc/powerd/soas.conf <<FOE
@@ -450,14 +457,10 @@ cat > /etc/powerd/soas.conf <<FOE
# closed, and will only sleep because of other timeouts.
#
config_BATTERY_TIME_DIM="180"
-#FIXME: something's broken with sleeping
-#config_BATTERY_TIME_SLEEP="360"
-config_BATTERY_TIME_SLEEP="99999"
+config_BATTERY_TIME_SLEEP="360"
config_BATTERY_TIME_BLANK="99999"
config_EBOOK_TIME_DIM="99999"
-#FIXME: something's broken with sleeping
-#config_EBOOK_TIME_SLEEP="20"
-config_EBOOK_TIME_SLEEP="99999"
+config_EBOOK_TIME_SLEEP="20"
config_EBOOK_TIME_BLANK="99999"
config_PLUGGED_TIME_DIM="99999"
config_PLUGGED_TIME_SLEEP="99999"
@@ -468,9 +471,7 @@ config_MAX_SLEEP_BEFORE_SHUTDOWN="99999"
config_ALLOW_SHUTDOWN_WHEN_PLUGGED="no"
config_CONFIRM_SECONDS="7"
config_CPU_IDLE_LIMIT="10"
-#FIXME: something's broken with sleeping
-#config_SLEEP_WHEN_LID_CLOSED="yes"
-config_SLEEP_WHEN_LID_CLOSED="no"
+config_SLEEP_WHEN_LID_CLOSED="yes"
FOE