Merge remote-tracking branch 'upstream/master' into dextrose4-dev

9 files changed, 31 insertions, 11 deletions

diff --git a/bin/zhashfs.c b/bin/zhashfs.c
index 9832f31..44f9c60 100644
--- a/bin/zhashfs.c
+++ b/bin/zhashfs.c
@@ -127,7 +127,7 @@ struct fiemap *read_fiemap(int fd)
 
 /* Given a file extent, determine which eblocks in the output file need to
  * represent that extent, and mark them as used in the eblocks_used map. */
-static void process_extent(struct fiemap_extent *ex)
+static long process_extent(struct fiemap_extent *ex)
 {
 	long i;
 	uint64_t last_byte = ex->fe_logical + ex->fe_length - 1;
@@ -137,17 +137,22 @@ static void process_extent(struct fiemap_extent *ex)
 	printf("Extent(%lld, %lld) occupies eblocks %d to %d\n", ex->fe_logical, ex->fe_length, first_eblock, last_eblock);
 	for (i = first_eblock; i <= last_eblock; i++)
 		eblocks_used[i] = 1;
+
+	return last_eblock;
 }
 
 /*
  * Use FIEMAP to determine the extents that make up a file.
  * Allocate eblocks_used array based on length of file, and then mark
  * the set of eblocks that contain data based on the extents.
+ * Returns the index of the last occupied eblock.
  */
-static void read_extents(FILE *infile)
+static long read_extents(FILE *infile)
 {
     int i;
     struct fiemap *fiemap = read_fiemap(fileno(infile));
+    long ret = 0;
+
     LTC_ARGCHK(fiemap != NULL);
 
     eblocks_used = malloc(eblocks);
@@ -155,7 +160,9 @@ static void read_extents(FILE *infile)
     memset(eblocks_used, 0, eblocks);
 
 	for (i=0; i < fiemap->fm_mapped_extents; i++)
-		process_extent(&fiemap->fm_extents[i]);
+		ret = process_extent(&fiemap->fm_extents[i]);
+
+    return ret;
 }
 
 int main(int argc, char **argv)
@@ -226,7 +233,7 @@ int main(int argc, char **argv)
 //    LTC_ARGCHK((eblocks * zblocksize) == insize);
     }
 
-    read_extents(infile);
+    eblocks = read_extents(infile) + 1;
 
     /* Remove possible path prefix */
     fname = strrchr(argv[5], '/');
diff --git a/examples/olpc-os-13.1.0-xo1.5.ini b/examples/olpc-os-13.1.0-xo1.5.ini
index 89fb174..f45eadb 100644
--- a/examples/olpc-os-13.1.0-xo1.5.ini
+++ b/examples/olpc-os-13.1.0-xo1.5.ini
@@ -65,5 +65,7 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1
 
+[sugar_welcome_activity]
+
 [buildnr_from_file]
 path=latestbuild
diff --git a/examples/olpc-os-13.1.0-xo1.75.ini b/examples/olpc-os-13.1.0-xo1.75.ini
index a2716c4..76e5635 100644
--- a/examples/olpc-os-13.1.0-xo1.75.ini
+++ b/examples/olpc-os-13.1.0-xo1.75.ini
@@ -67,5 +67,7 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1
 
+[sugar_welcome_activity]
+
 [buildnr_from_file]
 path=latestbuild
diff --git a/examples/olpc-os-13.1.0-xo1.ini b/examples/olpc-os-13.1.0-xo1.ini
index c46fca4..2b192a1 100644
--- a/examples/olpc-os-13.1.0-xo1.ini
+++ b/examples/olpc-os-13.1.0-xo1.ini
@@ -53,6 +53,8 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1Lite
 
+[sugar_welcome_activity]
+
 ; still too many open blockers for XO-1 idle suspend to work well
 [powerd]
 enable_idle_suspend=0
diff --git a/examples/olpc-os-13.1.0-xo4.ini b/examples/olpc-os-13.1.0-xo4.ini
index b40f4db..ab09624 100644
--- a/examples/olpc-os-13.1.0-xo4.ini
+++ b/examples/olpc-os-13.1.0-xo4.ini
@@ -66,6 +66,8 @@ protected_activities=
 	org.laptop.ImageViewerActivity,
 	org.laptop.RecordActivity
 
+[sugar_welcome_activity]
+
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1
 
diff --git a/modules/base/ksmain.10.core.inc b/modules/base/ksmain.10.core.inc
index 2ecf5ea..41309a0 100644
--- a/modules/base/ksmain.10.core.inc
+++ b/modules/base/ksmain.10.core.inc
@@ -1,4 +1,6 @@
-lang en_US.UTF-8
+# LANG=C considerably speeds up boot (measured 5sec) -- bernie
+lang C
+
 keyboard us
 auth --useshadow --enablemd5
 selinux --disabled
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc
index e7aea7f..857157c 100644
--- a/modules/base/kspkglist.10.core.inc
+++ b/modules/base/kspkglist.10.core.inc
@@ -53,5 +53,5 @@ ModemManager
 usb_modeswitch
 usb_modeswitch-data
 
-# provides lokkit, needed for disabling SELinux
-system-config-firewall-base
+# provides firewall-offline-cmd, needed for kickstart
+firewalld
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index 9303a61..dd72546 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -35,9 +35,6 @@ sed -i -e '1,6s/^#auth/auth/' /etc/pam.d/su
 # solution: don't ship this file in the image, then it won't get checked
 rm -f /etc/sysconfig/keyboard
 
-# Considerably speeds up boot (measured 5sec) -- bernie
-echo "LANG=C" > /etc/locale.conf
-
 # OLPC custom VT layout and serial console setup (#9517, #10354)
 sed -i -e 's:/sbin/agetty.*:/sbin/agetty --login-pause --autologin root --noclear %I:' \
 	/lib/systemd/system/getty\@.service
@@ -89,7 +86,8 @@ sed -i -e '/Before=/ s/$/ systemd-random-seed-load.service/' /lib/systemd/system
 # described at https://bugzilla.redhat.com/show_bug.cgi?id=808907#c7
 for i in fedora-loadmodules mdmonitor-takeover systemd-readahead-collect \
 		fedora-wait-storage fedora-storage-init fedora-storage-init-late \
-		fedora-autorelabel fedora-autorelabel-mark systemd-random-seed-save; do
+		fedora-autorelabel fedora-autorelabel-mark systemd-random-seed-save \
+		firewalld; do
 	ln -s /dev/null /etc/systemd/system/$i.service
 done
 
diff --git a/modules/sugar/kspost.50.misc.inc b/modules/sugar/kspost.50.misc.inc
index 250452d..d6a1575 100644
--- a/modules/sugar/kspost.50.misc.inc
+++ b/modules/sugar/kspost.50.misc.inc
@@ -1,3 +1,8 @@
 mkdir -p /home/olpc/{Activities,Library}
 chown olpc:olpc /home/olpc/{Activities,Library}
 
+# Remove non-functional squeak menu entry (#10480)
+# FIXME: remove when squeak-vm-4.x is adopted, where this change is
+# already included.
+rm -f /usr/share/applications/squeak.desktop
+update-desktop-database &> /dev/null || :