2 modules/base/kspost.10.core.inc
View file
@@ -10,7 +10,7 @@ mkdir /bootpart

# create olpc user
# Provide access to ttyUSB nodes (#8434)
/usr/sbin/useradd -m -c "olpc user" -G audio,wheel,uucp,video,dialout,lock olpc
/usr/sbin/useradd -m -c "olpc user" -G audio,wheel,video,dialout,lock olpc
/usr/bin/passwd -d olpc

# make sure to own home directory and relax permissions a little
3 modules/base/preimage.90.core.sh
View file
@@ -99,7 +99,8 @@ rm -f $fsmount/usr/lib/python2.7/lib2to3/tests/data/py3_test_grammar.py*
# now regenerate the .pyc files
# (add -OO to generate .pyo files instead when we tackle dlo trac #8431)
echo "Compiling python bytecode..."
chroot $fsmount python -m compileall /usr/lib /usr/share > /dev/null
chroot $fsmount python -m compileall /usr/lib/python2.7 /usr/share/sugar \
/usr/share/sugar-presence-service
# now we have to normalize the mtimes of the new pyc/pyo files, but we'll do
# that after we've finished making other fs changes below

1 modules/gnome/kspkglist.50.gnome.inc
View file
@@ -1,7 +1,6 @@
# gnome desktop
gnome-python2-gconf
gnome-desktop
gnome-panel
gnome-session
gnome-terminal
gnome-settings-daemon
2 modules/repos/ksmain.50.repos.py
View file
@@ -57,7 +57,7 @@ def add_to_excludes(baseurl, addexcludes):
elif key.startswith("CFG_repos__olpc_publicrpms_"):
for_excludes, name = value.split(',', 1)
for_excludes = int(for_excludes)
url = "http://rpmdropbox.laptop.org/%s" % name
url = "http://sugarlabs.org/~dnarvaez/oob/%s" % name
if for_excludes:
add_to_excludes(url, excludepkgs)
repos[name] = ("baseurl", url)
27 modules/sd_card_image/image.50.makefs.sh
View file
@@ -79,24 +79,20 @@ make_image()
$ROOT_PARTITION_START_BLOCK,,,
EOF

disk_loop=$(losetup --show --find --partscan $img)
boot_loop="${disk_loop}p1"
root_loop="${disk_loop}p2"

# Work around occasional failure for loop partitions to appear
# http://marc.info/?l=linux-kernel&m=134271282127702&w=2
local i=0
while ! [ -e "$boot_loop" ]; do
partx -a -v $disk_loop
sleep 1
(( ++i ))
[ $i -ge 10 ] && break
done

echo "Create filesystems..."

boot_loop=$(losetup -f)
losetup $boot_loop $img -o 4194304 --sizelimit 62914560

mke2fs -O dir_index,^resize_inode -L Boot -F $boot_loop
mount $boot_loop $BOOT

local root_start=$(($ROOT_PARTITION_START_BLOCK * $BLOCK_SIZE))
local root_size=$(($image_size - $root_start))

root_loop=$(losetup -f)
losetup $root_loop $img -o $root_start --sizelimit $root_size

mkfs.ext4 -O dir_index,^huge_file -E resize=8G -m1 -L OLPCRoot $root_loop
tune2fs -o journal_data_ordered $root_loop
mount $root_loop $ROOT
@@ -132,7 +128,8 @@ EOF

umount $ROOT
umount $BOOT
losetup -d $disk_loop || :
losetup -d $boot_loop || :
losetup -d $root_loop || :

# FIXME: any value to running e2fsck now? maybe with -D ?
}
3 modules/sugar/kspkglist.50.sugar.inc
View file
@@ -5,11 +5,13 @@ sugar-toolkit
sugar-toolkit-gtk3

# sugar control panels
sugar-cp-backup
sugar-cp-datetime
sugar-cp-frame
sugar-cp-language
sugar-cp-modemconfiguration
sugar-cp-network
sugar-cp-webservices
sugar-cp-power

# additional sugar packages
@@ -27,7 +29,6 @@ csound-python
pygame
python-alsaaudio
squeak-vm
python-cjson
libabiword

# Browse
26 modules/sugar/kspost.50.gconf.inc
View file
@@ -1,14 +1,20 @@
# Sugar font
gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type float --set /desktop/sugar/font/default_size 7
cat >/usr/share/glib-2.0/schemas/sugar.oob.gschema.override <<EOF
[org.sugarlabs]
show-logout=false

[org.sugarlabs.font]
default-size=7

# disable logout button in Sugar
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false
[org.sugarlabs.power]
automatic=true

# set sugar power management on
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic true
[org.sugarlabs.collaboration]
jabber-server=''

# set empty jabber server so that no gabble connection is attempted by default
gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /desktop/sugar/collaboration/jabber_server ''
[org.sugarlabs.user]
default-nick='disabled'
EOF
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas

# Ask for the nick name when starting Sugar the first time
gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /desktop/sugar/user/default_nick 'disabled'
# set font size in gconf for gtk2 activities
gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type float --set /desktop/sugar/font/default_size 7
13 modules/sugar/kspost.60.protect.sh
View file
@@ -10,11 +10,18 @@ if [[ -n "$activities" ]]; then
IFS=$'\n\t, '
for activity in $activities; do
if [[ -n "$list" ]]; then
list=$list','$activity
list=$list,"'${activity}'"
else
list=$activity
list="'${activity}'"
fi
done
echo "gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type list --list-type string --set /desktop/sugar/protected_activities [$list]"

echo "
cat >/usr/share/glib-2.0/schemas/sugar.oob.protected.gschema.override <<EOF
[org.sugarlabs]
protected-activities=[${list}]
EOF
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas"

IFS=$oIFS
fi
6 modules/xo1/kspost.50.xo1-tweaks.inc
View file
@@ -1,5 +1,9 @@
# do not show the Sugar default ad-hoc networks on the XO-1
gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /desktop/sugar/network/adhoc false
cat >/usr/share/glib-2.0/schemas/sugar.oob.xo1.gschema.override <<EOF
[org.sugarlabs.network]
adhoc=false
EOF
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas

# enable serial console on ttyS0
ln -sf /lib/systemd/system/serial-getty@.service \
2 osbuilder.py
View file
@@ -18,7 +18,7 @@
#

# canonical source of version number
VERSION="7.0.1"
VERSION="8.0.1"

# "make install" modifies this in the installed copy
INSTALLED=0