On Thu, 2011-01-27 at 09:01 -0500, Martin Langhoff wrote:
> Very interesting. Strange. Unexpected.
> 
> On Wed, Jan 26, 2011 at 11:30 PM, James Cameron <qu...@laptop.org> wrote:
> > Until these problems are fixed, please change your build;
> 
> Could this be added to http://wiki.laptop.org/go/OS_Builder#Recipes ?

I've split this into two parts, part of the build-system needs patching,
modules/base/kspost.10.core.inc. The second part adds the rpm in the ini
file, and uses the custom_scripts module to write changes to the image.
http://dev.laptop.org.au/projects/xo-au/repository The two main files
are examples/olpc-os-10.1.3-xo1.5AU.ini and setAU.sh

Jerry
 

 
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index 4daa967..aecb68d 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -64,6 +64,14 @@ sed -i -e 's/TEMPORARY_STATE=no/TEMPORARY_STATE=yes/' \
 # Remove resolv.conf from rwtab so that it can be updated atomically (#2748)
 sed -i -e "/resolv.conf/d" /etc/rwtab
 
+# Remove adjtime from rwtab so that it can be updated atomically (#10605)
+sed -i -e "/adjtime/d" /etc/rwtab
+
+# sigh.. must append UTC to /etc/adjtime or ntpdate writes localtime
+cat << EOF >> /etc/adjtime
+UTC
+EOF
+
 # ensure temporary state directory doesn't get too fat (#9636)
 sed -i -e 's/RW_OPTIONS=/RW_OPTIONS="-o size=1M -o nr_inodes=1024"/' /etc/sysconfig/readonly-root
_______________________________________________
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel

Reply via email to