Merge remote-tracking branch 'olpc/master' into test-oob

5 files changed, 33 insertions, 16 deletions

diff --git a/examples/olpc-os-13.1.0-xo1.5.ini b/examples/olpc-os-13.1.0-xo1.5.ini
index 1ba43ce..89fb174 100644
--- a/examples/olpc-os-13.1.0-xo1.5.ini
+++ b/examples/olpc-os-13.1.0-xo1.5.ini
@@ -13,11 +13,14 @@ 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
 
 [sd_card_image]
 
+[usb_update]
+
 [repos]
-fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f18
-olpc_publicrpms_2=1,f18-xo1.5
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+olpc_frozen_1=0,koji.dist-f18-i686-13.1.0
+olpc_frozen_2=0,koji.dist-f18-i686-updates-13.1.0
+olpc_frozen_3=1,local.13.1.0
+olpc_frozen_4=1,local.13.1.0-xo1.5
+add_excludes_to=koji.dist-f18-i686-13.1.0,koji.dist-f18-i686-updates-13.1.0
 
 [yumcfg]
 addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
diff --git a/examples/olpc-os-13.1.0-xo1.75.ini b/examples/olpc-os-13.1.0-xo1.75.ini
index 3cfe750..a2716c4 100644
--- a/examples/olpc-os-13.1.0-xo1.75.ini
+++ b/examples/olpc-os-13.1.0-xo1.75.ini
@@ -13,11 +13,14 @@ 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
 
 [sd_card_image]
 
+[usb_update]
+
 [repos]
-fedora=fedora,fedora-updates-testing
-olpc_publicrpms_1=1,f18
-olpc_publicrpms_2=1,f18-xo1.75
-add_excludes_to=fedora,fedora-updates-testing
+olpc_frozen_1=0,koji.dist-f18-armv7hl-13.1.0
+olpc_frozen_2=0,koji.dist-f18-armv7hl-updates-13.1.0
+olpc_frozen_3=1,local.13.1.0
+olpc_frozen_4=1,local.13.1.0-xo1.75
+add_excludes_to=koji.dist-f18-armv7hl-13.1.0,koji.dist-f18-armv7hl-updates-13.1.0
 
 [yumcfg]
 addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
diff --git a/examples/olpc-os-13.1.0-xo1.ini b/examples/olpc-os-13.1.0-xo1.ini
index bd7a7a5..c46fca4 100644
--- a/examples/olpc-os-13.1.0-xo1.ini
+++ b/examples/olpc-os-13.1.0-xo1.ini
@@ -13,11 +13,14 @@ 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
 
 [jffs2_image]
 
+[usb_update]
+
 [repos]
-fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f18
-olpc_publicrpms_2=1,f18-xo1
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+olpc_frozen_1=0,koji.dist-f18-i686-13.1.0
+olpc_frozen_2=0,koji.dist-f18-i686-updates-13.1.0
+olpc_frozen_3=1,local.13.1.0
+olpc_frozen_4=1,local.13.1.0-xo1
+add_excludes_to=koji.dist-f18-i686-13.1.0,koji.dist-f18-i686-updates-13.1.0
 
 [yumcfg]
 addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
diff --git a/examples/olpc-os-13.1.0-xo4.ini b/examples/olpc-os-13.1.0-xo4.ini
index 1fd5c96..b40f4db 100644
--- a/examples/olpc-os-13.1.0-xo4.ini
+++ b/examples/olpc-os-13.1.0-xo4.ini
@@ -13,11 +13,14 @@ 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
 
 [sd_card_image]
 
+[usb_update]
+
 [repos]
-fedora=fedora,fedora-updates-testing
-olpc_publicrpms_1=1,f18
-olpc_publicrpms_2=1,f18-xo4
-add_excludes_to=fedora,fedora-updates-testing
+olpc_frozen_1=0,koji.dist-f18-armv7hl-13.1.0
+olpc_frozen_2=0,koji.dist-f18-armv7hl-updates-13.1.0
+olpc_frozen_3=1,local.13.1.0
+olpc_frozen_4=1,local.13.1.0-xo4
+add_excludes_to=koji.dist-f18-armv7hl-13.1.0,koji.dist-f18-armv7hl-updates-13.1.0
 
 [yumcfg]
 addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index 70ea493..9303a61 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -220,6 +220,11 @@ 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
 
+# limit journal memory usage (#12286)
+sed -i -e 's/#RuntimeMaxUse=$/RuntimeMaxUse=2M/' \
+	-e 's/#RuntimeMaxFileSize=$/RuntimeMaxFileSize=1M/' \
+	/etc/systemd/journald.conf
+
 # tweak upower behaviour, mostly to ignore lid events (#11815)
 sed -i -e 's/EnableWattsUpPro=true/EnableWattsUpPro=false/' \
 	-e 's/IgnoreLid=false/IgnoreLid=true/' \