SoaS: hopefully fix F-18+ live images, still might need some minor tweaks

This commit is contained in:
Peter Robinson 2012-11-30 14:54:40 +00:00
parent fe6dec7816
commit 12a2e993a1

View File

@ -8,12 +8,20 @@
# - Sebastian Dziallas <sdz AT fedoraproject DOT org> # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
# - Mel Chua <mchua AT fedoraproject DOT org> # - Mel Chua <mchua AT fedoraproject DOT org>
%include fedora-live-mini.ks #%include fedora-live-mini.ks
%include fedora-live-desktop.ks
%include fedora-live-minimization.ks
part / --size=3072 part / --size=4096
firewall --enabled --service=mdns,presence firewall --enabled --service=mdns,presence
%packages %packages
-@fonts
-@dial-up
-@multimedia
-@printing
-foomatic
-@gnome-desktop
# == Core Sugar Platform == # == Core Sugar Platform ==
@sugar-desktop @sugar-desktop
@ -56,6 +64,7 @@ sugar-logos
%post %post
# Rebuild initrd for Sugar boot screen # Rebuild initrd for Sugar boot screen
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
/usr/sbin/plymouth-set-default-theme sugar /usr/sbin/plymouth-set-default-theme sugar
@ -66,7 +75,7 @@ rm -f /var/lib/rpm/__db*
# Get proper release naming in the control panel # Get proper release naming in the control panel
cat >> /boot/olpc_build << EOF cat >> /boot/olpc_build << EOF
Sugar on a Stick 8 Sugar on a Stick 8 ('Ōhelo Berry)
Fedora release 18 (Spherical Cow) Fedora release 18 (Spherical Cow)
EOF EOF
@ -93,12 +102,6 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override <
disable-lock-screen=true disable-lock-screen=true
FOE FOE
# disable updates plugin
cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
[org.gnome.settings-daemon.plugins.updates]
active=false
FOE
# Add our activities to the favorites # Add our activities to the favorites
cat > /usr/share/sugar/data/activities.defaults << FOE cat > /usr/share/sugar/data/activities.defaults << FOE
org.laptop.WebActivity org.laptop.WebActivity
@ -138,15 +141,13 @@ FOE
# rebuild schema cache with any overrides we installed # rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas glib-compile-schemas /usr/share/glib-2.0/schemas
# set up timed auto-login for after 60 seconds # set up auto-login
cat >> /etc/gdm/custom.conf << FOE cat >> /etc/gdm/custom.conf << FOE
[daemon] [daemon]
AutomaticLoginEnable=True AutomaticLoginEnable=True
AutomaticLogin=liveuser AutomaticLogin=liveuser
FOE FOE
EOF
chmod 755 /etc/rc.d/init.d/livesys-late chmod 755 /etc/rc.d/init.d/livesys-late
/sbin/restorecon /etc/rc.d/init.d/livesys-late /sbin/restorecon /etc/rc.d/init.d/livesys-late
/sbin/chkconfig --add livesys-late /sbin/chkconfig --add livesys-late