Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2010-07-14 21:11:38 (GMT)
committer Chris Ball <cjb@laptop.org>2010-07-14 21:11:38 (GMT)
commitb256e0e3aceb98fe7d779327dcdf3e01687cb9e9 (patch)
tree6289e4c9c4a123f82fb3dde8212a940f0ad8bc18 /modules
parentd0bfed22418f8301e4ad9f12adea632ee1a58776 (diff)
parentfac40137ab294972a48859549849e5c970b770c8 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/olpc-os-builder
(Conflict with powerd config.)
Diffstat (limited to 'modules')
-rw-r--r--modules/xo1/kspost.50.xo1-tweaks.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/xo1/kspost.50.xo1-tweaks.inc b/modules/xo1/kspost.50.xo1-tweaks.inc
index a5d2aa2..a60ecb2 100644
--- a/modules/xo1/kspost.50.xo1-tweaks.inc
+++ b/modules/xo1/kspost.50.xo1-tweaks.inc
@@ -10,3 +10,7 @@ echo "%__dbi_cdb create private nommap" > /etc/rpm/macros.rpmdb
# what's more, olpc.fth really shouldnt specify a root device
sed -i -e 's:root=mtd0:root=/dev/mtdblock0:g' /boot/olpc.fth
+# Temporarily disable pretty boot to aid diagnosis of boot hangs
+# (could be http://dev.laptop.org/ticket/9100 )
+sed -i -e 's: boot$: visible unfreeze boot:g' /boot/olpc.fth
+