[spin-kickstarts/f18] [games] Don't include libreoffice in the games spin
by Bruno Wolff III
commit 760203e3976a1bf5b64f6af1b398b52176568aa0
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Dec 11 15:41:31 2012 -0600
[games] Don't include libreoffice in the games spin
libreoffice was added to the livecd desktop spin very late in the
development cycle and there isn't a lot of time to futz around with
this as we are freezing today. The change would likely put the games
spin oversize. For now just don't include libreoffice stuff. Later
we may want to keep it and adjust the included games.
fedora-livedvd-games.ks | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks
index f5099d0..f7658ed 100644
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@@ -16,6 +16,10 @@ part / --size 10240
-wine
+# Remove libreoffice since it just got added to livecd-desktop and
+# will likely put the games spin over size and it is freeze time.
+-libreoffice*
+
# Allow joysticks and game pads to work
joystick-support
11 years, 4 months
[spin-kickstarts] Handle current dracut livedir argument. (#881124)
by Bill Nottingham
commit 1bb77a590969ebece3f87294ca133953d6cb6f89
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 14:28:03 2012 -0500
Handle current dracut livedir argument. (#881124)
fedora-live-base.ks | 4 ++++
fedora-live-mini.ks | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 55ae05e..0071987 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -83,6 +83,10 @@ ln -sf /dev/null /etc/systemd/system/hwclock-save.service
livedir="LiveOS"
for arg in \`cat /proc/cmdline\` ; do
+ if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
+ livedir=\${arg##rd.live.dir=}
+ return
+ fi
if [ "\${arg##live_dir=}" != "\${arg}" ]; then
livedir=\${arg##live_dir=}
return
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 7572df5..4aeafc5 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -127,6 +127,10 @@ ln -sf /dev/null /etc/systemd/system/hwclock-save.service
livedir="LiveOS"
for arg in \`cat /proc/cmdline\` ; do
+ if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
+ livedir=\${arg##rd.live.dir=}
+ return
+ fi
if [ "\${arg##live_dir=}" != "\${arg}" ]; then
livedir=\${arg##live_dir=}
return
11 years, 4 months
[spin-kickstarts/f18] Handle current dracut livedir argument. (#881124)
by Bill Nottingham
commit 73d04fdb1d724a701499059717c18f28b70ca059
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 14:28:03 2012 -0500
Handle current dracut livedir argument. (#881124)
fedora-live-base.ks | 4 ++++
fedora-live-mini.ks | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index d4f9a74..e4c064a 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -83,6 +83,10 @@ ln -sf /dev/null /etc/systemd/system/hwclock-save.service
livedir="LiveOS"
for arg in \`cat /proc/cmdline\` ; do
+ if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
+ livedir=\${arg##rd.live.dir=}
+ return
+ fi
if [ "\${arg##live_dir=}" != "\${arg}" ]; then
livedir=\${arg##live_dir=}
return
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index ec91614..b9d1033 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -127,6 +127,10 @@ ln -sf /dev/null /etc/systemd/system/hwclock-save.service
livedir="LiveOS"
for arg in \`cat /proc/cmdline\` ; do
+ if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
+ livedir=\${arg##rd.live.dir=}
+ return
+ fi
if [ "\${arg##live_dir=}" != "\${arg}" ]; then
livedir=\${arg##live_dir=}
return
11 years, 4 months
[spin-kickstarts] Add gimp-help langpacks to DVD. (#879030)
by Bill Nottingham
commit 69ccdc5502319281bd677876236d9333a6dc00ce
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 14:11:36 2012 -0500
Add gimp-help langpacks to DVD. (#879030)
fedora-install-fedora.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index a3dffe7..841e604 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -118,6 +118,7 @@ dracut-*
aspell-*
autocorr-*
eclipse-nls-*
+gimp-help-*
hunspell-*
hyphen-*
calligra-l10n-*
11 years, 4 months
[spin-kickstarts/f18] Add gimp-help langpacks to DVD. (#879030)
by Bill Nottingham
commit 25cd1d7d724c1c0b97305297b426360094106528
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 14:11:36 2012 -0500
Add gimp-help langpacks to DVD. (#879030)
fedora-install-fedora.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 609c18a..2e37bc6 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -118,6 +118,7 @@ dracut-*
aspell-*
autocorr-*
eclipse-nls-*
+gimp-help-*
hunspell-*
hyphen-*
calligra-l10n-*
11 years, 4 months
[spin-kickstarts/f18] Drop the livecd libreoffice exclude, as that's what actually gets composed from.
by Bill Nottingham
commit 269b2f5f9a687e40f1269c25f25814a1439f5d76
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 14:03:00 2012 -0500
Drop the livecd libreoffice exclude, as that's what actually gets composed from.
fedora-livecd-desktop.ks | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 832c3c0..2bbdebb 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -8,7 +8,6 @@
%packages
# First, no office
--libreoffice-*
-planner
# Drop the Java plugin
11 years, 4 months
[spin-kickstarts] Drop the livecd libreoffice exclude, as that's what actually gets composed from.
by Bill Nottingham
commit 81099925113de12a0591f62b96bd0f730376b9f1
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 14:03:00 2012 -0500
Drop the livecd libreoffice exclude, as that's what actually gets composed from.
fedora-livecd-desktop.ks | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index cea1df7..4f63adb 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -8,7 +8,6 @@
%packages
# First, no office
--libreoffice-*
-planner
# Drop the Java plugin
11 years, 4 months
[spin-kickstarts] Add libreoffice to desktop image. (#885693)
by Bill Nottingham
commit 1fed4cf39519c1d59fe234f18912ee0c750e23e4
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 13:56:51 2012 -0500
Add libreoffice to desktop image. (#885693)
fedora-live-desktop.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index f7b852f..d8e226b 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -9,6 +9,7 @@ part / --size 4096
%packages
@firefox
@gnome-desktop
+@libreoffice
# FIXME; apparently the glibc maintainers dislike this, but it got put into the
# desktop image at some point. We won't touch this one for now.
11 years, 4 months
[spin-kickstarts/f18] Add libreoffice to desktop image. (#885693)
by Bill Nottingham
commit 62b6000b09f39bc9b8f7c1a8d285e70608438dbe
Author: Bill Nottingham <notting(a)redhat.com>
Date: Tue Dec 11 13:56:51 2012 -0500
Add libreoffice to desktop image. (#885693)
fedora-live-desktop.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index f7b852f..d8e226b 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -9,6 +9,7 @@ part / --size 4096
%packages
@firefox
@gnome-desktop
+@libreoffice
# FIXME; apparently the glibc maintainers dislike this, but it got put into the
# desktop image at some point. We won't touch this one for now.
11 years, 4 months
[spin-kickstarts] SoaS: Fix and cleanup a number of things in the spin
by Peter Robinson
commit 264356737bbe988b97d12c65c2685cf81f198b46
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon Dec 10 22:49:06 2012 +0000
SoaS: Fix and cleanup a number of things in the spin
fedora-livecd-soas.ks | 84 ++++++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 36 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index e8e1648..9a185a7 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -9,10 +9,9 @@
# - Mel Chua <mchua AT fedoraproject DOT org>
#%include fedora-live-mini.ks
-%include fedora-live-desktop.ks
+%include fedora-live-base.ks
%include fedora-live-minimization.ks
-part / --size=4096
firewall --enabled --service=mdns,presence
%packages
@@ -22,6 +21,19 @@ firewall --enabled --service=mdns,presence
-@printing
-foomatic
-@gnome-desktop
+-yp-tools
+-ypbind
+-rdate
+-rdist
+-icedtea-web
+-sendmail
+-firefox
+-glx-utils
+-nmap-ncat
+-PackageKit
+-libfprint
+-realmd
+-eekboard-libs
# == Core Sugar Platform ==
@sugar-desktop
@@ -64,7 +76,6 @@ sugar-logos
%post
-
# Rebuild initrd for Sugar boot screen
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
/usr/sbin/plymouth-set-default-theme sugar
@@ -79,31 +90,8 @@ Sugar on a Stick 8 ('Ōhelo Berry)
Fedora release 18 (Spherical Cow)
EOF
-cat >> /etc/rc.d/init.d/livesys-late << EOF
-
-# Don't use the default system user (in SoaS liveuser) as nick name
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
-
-# Disable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-
-# Enable Sugar power management
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
-
-# disable screensaver locking
-cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
-[org.gnome.desktop.screensaver]
-lock-enabled=false
-FOE
-
-# and hide the lock screen option
-cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
-[org.gnome.desktop.lockdown]
-disable-lock-screen=true
-FOE
-
# Add our activities to the favorites
-cat > /usr/share/sugar/data/activities.defaults << FOE
+cat > /usr/share/sugar/data/activities.defaults << EOF
org.laptop.WebActivity
org.laptop.HelpActivity
org.laptop.Chat
@@ -119,13 +107,15 @@ org.laptop.physics
org.laptop.Pippy
org.laptop.RecordActivity
org.laptop.Oficina
+org.laptop.StopWatchActivity
+org.laptop.community.Finance
org.laptop.community.TypingTurtle
org.laptop.sugar.Jukebox
org.gnome.Labyrinth
com.laptop.Ruler
org.sugarlabs.AbacusActivity
org.sugarlabs.IRC
-org.sugarlabs.Infoslicer
+org.sugarlabs.InfoSlicer
org.sugarlabs.PortfolioActivity
org.sugarlabs.VisualMatchActivity
com.garycmartin.Moon
@@ -133,21 +123,43 @@ mulawa.Countries
tv.alterna.Clock
vu.lux.olpc.Maze
vu.lux.olpc.Speak
-org.laptop.community.Finance
-org.laptop.Terminal
-org.laptop.Log
-FOE
-
-# rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
+EOF
# set up auto-login
-cat >> /etc/gdm/custom.conf << FOE
+cat >> /etc/gdm/custom.conf << EOF
[daemon]
AutomaticLoginEnable=True
AutomaticLogin=liveuser
+EOF
+
+# Don't use the default system user (in SoaS liveuser) as nick name
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
+
+# Disable the logout menu item in Sugar
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
+
+# Enable Sugar power management
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
+
+cat >> /etc/rc.d/init.d/livesys-late << EOF
+
+# disable screensaver locking
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+FOE
+
+# and hide the lock screen option
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
FOE
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
chmod 755 /etc/rc.d/init.d/livesys-late
/sbin/restorecon /etc/rc.d/init.d/livesys-late
/sbin/chkconfig --add livesys-late
11 years, 4 months