diff options
| author | Martin Langhoff <martin@laptop.org> | 2012-04-25 14:02:11 (GMT) |
|---|---|---|
| committer | Martin Langhoff <martin@laptop.org> | 2012-04-25 14:02:11 (GMT) |
| commit | 5c7bdf64558df5514a30df3661eb78d9b0140569 (patch) | |
| tree | ac1aedf90439da583db484d98aa57ced0a456b34 | |
| parent | 507b24cc39a5bfa873895d2c81d220582898fb5a (diff) | |
| parent | 21a62feff00595a6ef830bee2b0fc06c9556f0a8 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/olpc-os-builder
| -rw-r--r-- | bin/zhashfs.c | 4 | ||||
| -rw-r--r-- | examples/f17-xo1.ini | 2 | ||||
| -rw-r--r-- | modules/base/kspost.10.core.inc | 9 | ||||
| -rw-r--r-- | modules/sugar/kspkglist.50.sugar.inc | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/bin/zhashfs.c b/bin/zhashfs.c index dd712ae..9832f31 100644 --- a/bin/zhashfs.c +++ b/bin/zhashfs.c @@ -241,6 +241,10 @@ int main(int argc, char **argv) fprintf(stdout, "Total blocks: %ld\n", eblocks); + /* wipe the partition table first in case of partial completion */ + memset(buf, 0, zblocksize); + write_block(0, buf); + /* make a hash of the file */ for (i=1; i < eblocks; i++) { if (!eblocks_used[i]) diff --git a/examples/f17-xo1.ini b/examples/f17-xo1.ini index e890377..1915442 100644 --- a/examples/f17-xo1.ini +++ b/examples/f17-xo1.ini @@ -10,7 +10,7 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa [xo1] -[ubifs_image] +[jffs2_image] [repos] fedora_arch=i386 diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc index ca000c4..2584362 100644 --- a/modules/base/kspost.10.core.inc +++ b/modules/base/kspost.10.core.inc @@ -89,9 +89,9 @@ cat >/etc/statetab.d/olpc <<EOF EOF # systemd stuff that is not interesting for us -for i in fedora-loadmoules mdmonitor-takeover systemd-readahead-collect \ +for i in fedora-loadmodules mdmonitor-takeover systemd-readahead-collect \ fedora-wait-storage fedora-storage-init fedora-storage-init-late \ - fedora-autorelabel-mark; do + fedora-autorelabel fedora-autorelabel-mark; do ln -s /dev/null /etc/systemd/system/$i.service done @@ -214,3 +214,8 @@ ln -s /dev/null /etc/systemd/system/plymouth-start.service sed -i -e 's/plymouthd --mode=shutdown/plymouthd --mode=shutdown --kernel-command-line=rhgb/g' /lib/systemd/system/plymouth-poweroff.service sed -i -e 's/plymouthd --mode=shutdown/plymouthd --mode=shutdown --kernel-command-line=rhgb/g' /lib/systemd/system/plymouth-halt.service sed -i -e 's/plymouthd --mode=shutdown/plymouthd --mode=shutdown --kernel-command-line=rhgb/g' /lib/systemd/system/plymouth-reboot.service + +# call olpc-logrotate when log file hits 1mb (#10075) +sed -i -e 's,/var/log/messages,:omfile:$messages,' \ + -e '/$messages/ i$outchannel messages,/var/log/messages,1048576,/usr/sbin/olpc-logrotate' \ + /etc/rsyslog.conf diff --git a/modules/sugar/kspkglist.50.sugar.inc b/modules/sugar/kspkglist.50.sugar.inc index 9952671..353ae67 100644 --- a/modules/sugar/kspkglist.50.sugar.inc +++ b/modules/sugar/kspkglist.50.sugar.inc @@ -8,7 +8,6 @@ sugar-toolkit-gtk3 libxml2-python pyabiword webkitgtk3 -udisks espeak etoys evince-djvu @@ -23,7 +22,6 @@ python-alsaaudio squeak-vm # Browse -webkitgtk3 gnash-plugin totem-mozplugin @@ -32,7 +30,6 @@ vte # dependencies for Epub support in Read python-BeautifulSoup -python-lxml olpc-library # for Tuxmath activity |