From 009e2bc96b8bb9832684b66ee38577c98643a11c Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Tue, 21 Jul 2009 14:59:51 +0200 Subject: [PATCH 01/24] apply changes for new education spin concept - move to Gnome & Sugar as desktop environments - add default IRC channels - include development tools --- fedora-livecd-education.ks | 106 ------------------------ fedora-livedvd-education.ks | 156 ++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 106 deletions(-) delete mode 100644 fedora-livecd-education.ks create mode 100644 fedora-livedvd-education.ks diff --git a/fedora-livecd-education.ks b/fedora-livecd-education.ks deleted file mode 100644 index 813b7b5..0000000 --- a/fedora-livecd-education.ks +++ /dev/null @@ -1,106 +0,0 @@ -# fedora-livecd-education.ks -# -# Description: -# - Fedora Live Spin including mainly software for educational purposes -# -# Maintainers: -# - Sebastian Dziallas -# - Fedora Education SIG - -%include fedora-live-base.ks - -# please don't forget to adjust the instLangs argument -# if you are going to create a localized spin -%packages --excludedocs --instLangs en_US - -# desktop environments -@sugar-desktop -@xfce-desktop - -# education -avogadro -kdeedu - -# internet -alpine -empathy -firefox - -# office -abiword -gnumeric -evince - -# graphics -blender -inkscape -gimp -mirage - -# audio & video -totem -totem-gstreamer -totem-mozplugin --totem-xine --xine-lib - -# others -geany -gnash-plugin - -# system -alsa-plugins-pulseaudio -desktop-backgrounds-compat -gnome-power-manager -liveusb-creator -NetworkManager-gnome -pavucontrol -setroubleshoot -xdg-user-dirs - -# remove imsettings-xfce for now until it gets re-written --imsettings-xfce - -# dictionaries are big --aspell-* --hunspell-* --man-pages-* --words - -# exclude input methods --scim* --m17n* - -# save some space --autofs --nss_db --sendmail -ssmtp --acpid --isdn4k-utils --gimp-help --gimp-help-browser - -%post - -# create /etc/sysconfig/desktop (needed for installation) -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF -chown -R liveuser:liveuser /home/liveuser - -# disable screensaver locking -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -TimedLoginEnable=true -TimedLogin=liveuser -TimedLoginDelay=60 -FOE - -EOF - -%end diff --git a/fedora-livedvd-education.ks b/fedora-livedvd-education.ks new file mode 100644 index 0000000..96aa730 --- /dev/null +++ b/fedora-livedvd-education.ks @@ -0,0 +1,156 @@ +# fedora-livedvd-education.ks +# +# Description: +# - Fedora Live Spin with the purpose to create a ready-to-go +# development environment for contributing to educational +# projects inside, but also outside of the Fedora ecosystem. +# +# Maintainers: +# - Sebastian Dziallas +# - Fedora Education SIG + +%include fedora-live-base.ks + +%packages + +# desktop environments +@gnome-desktop +@sugar-desktop +sugar-emulator + +# education +gnuplot +kdeedu +moodle +octave + +# internet +# education-bookmarks +firefox +java-1.6.0-openjdk-plugin +xchat-gnome + +# office +evince +openoffice.org-calc +openoffice.org-impress +openoffice.org-math +openoffice.org-writer + +# graphics +gimp +inkscape + +# audio & video +totem +totem-mozplugin + +# stuff to make sugar-jhbuild work out of the box +avahi-gobject-devel +avahi-tools +enchant-devel +fribidi-devel +icon-naming-utils +icon-slicer +libcroco-devel +libffi-devel +libgsf-devel +librsvg2-devel +loudmouth-devel +olpcsound-devel +poppler-glib-devel +python-distutils-extra +redhat-lsb +wv-devel +xulrunner-devel-unstable +xulrunner-python-devel + +# development +@development-libs +@development-tools +@fedora-packager +@gnome-software-development +giggle +numpy +pygame + +# eclipse environment +@eclipse +eclipse-eclox +# eclipse-texlipse + +# virtualization +@virtualization + +# additional removals from gnome +-evolution +-gok +-gthumb +-nautilus-sendto +-orca +-tomboy + +# remove some sugar packages +-sugar-finance +-sugar-help +-sugar-xoirc +-sugar-xomail + +# dictionaries are big +-aspell-* +-hunspell-* +-man-pages-* +-words + +# exclude input methods +-scim* +-m17n* + +# save some space +-gnome-user-docs +-nss_db +-vino +-isdn4k-utils +-dasher +-tomboy +# not needed for gnome +-acpid + +%end + +%post + +cat >> /etc/rc.d/init.d/livesys << EOF + +# enable 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 true >/dev/null + +# disable screensaver locking +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null + +# set up timed auto-login for after 60 seconds +cat >> /etc/gdm/custom.conf << FOE +[daemon] +TimedLoginEnable=true +TimedLogin=liveuser +TimedLoginDelay=60 +FOE + +# create file for xchat default servers +mkdir -p /home/liveuser/.xchat-gnome + +cat >> /home/liveuser/.xchat-gnome/servlist_.conf << FOE +v=0.26.0 + +N=FreeNode +J=#fedora-edu,#sugar,#teachingopensource +F=3 +D=0 +S=irc.freenode.net +FOE + +chown liveuser:liveuser /home/liveuser/.xchat-gnome/servlist_.conf + +EOF + +%end From 59179855b178d8ecf6e247e426ff9f96fecdc964 Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Tue, 21 Jul 2009 15:02:58 +0200 Subject: [PATCH 02/24] move to dvd size for education spin now --- fedora-livedvd-education.ks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-livedvd-education.ks b/fedora-livedvd-education.ks index 96aa730..d14603e 100644 --- a/fedora-livedvd-education.ks +++ b/fedora-livedvd-education.ks @@ -11,6 +11,9 @@ %include fedora-live-base.ks +# we need more space now +part / --size=8192 + %packages # desktop environments From d598398360730bfa05f8ece3b7124b2e2df2d575 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 21 Jul 2009 09:00:52 -0500 Subject: [PATCH 03/24] Removed liferea, dead upstream and we can use Firefox to pull feeds --- fedora-livecd-xfce.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index db6d5a3..bcdb99d 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -51,7 +51,6 @@ totem-mozplugin pidgin claws-mail xfburn -liferea quodlibet gftp ristretto From 82ec2d19470d208acb1ea049b2ddc8e16adf3243 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 21 Jul 2009 09:14:07 -0500 Subject: [PATCH 04/24] Added gparted, changed galculator for gcalctool --- fedora-livecd-xfce.ks | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index bcdb99d..5387880 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -19,6 +19,8 @@ NetworkManager-openvpn NetworkManager-gnome NetworkManager-pptp +gparted + # Add the midori browser as a lighter alternative midori @@ -35,7 +37,7 @@ evince gimp inkscape -galculator +gcalctool desktop-backgrounds-compat gnome-screensaver setroubleshoot From 75e4a7ad2041e25875b31ddfa4baf7ea8a04bc48 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 21 Jul 2009 10:41:03 -0500 Subject: [PATCH 05/24] Added liferea back, it is *not* dead upstream, communications mistake. --- fedora-livecd-xfce.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 5387880..1f53cbb 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -53,6 +53,7 @@ totem-mozplugin pidgin claws-mail xfburn +liferea quodlibet gftp ristretto From 08f803e44093739399dba3ff7121ab1fcded2586 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Jul 2009 14:56:11 -0400 Subject: [PATCH 06/24] Drop krb5-auth-dialog from the desktop spin --- fedora-livecd-desktop.ks | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 58d1b88..5491bf2 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -43,6 +43,7 @@ festvox-slt-arctic-hts -dasher -evince-dvi -evince-djvu +-krb5-auth-dialog # not needed for gnome -acpid -wget @@ -60,6 +61,7 @@ festvox-slt-arctic-hts -system-config-rootpassword -system-config-services -policycoreutils-gui + %end %post From 91030f9ce33758e6fb226258288c1bb8f316a0bb Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 21 Jul 2009 15:15:50 -0500 Subject: [PATCH 07/24] Added claws-mail plugins for various enhancements --- fedora-livecd-xfce.ks | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 1f53cbb..683cc1f 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -52,6 +52,21 @@ totem totem-mozplugin pidgin claws-mail +claws-mail-plugins-archive +claws-mail-plugins-att-remover +claws-mail-plugins-attachwarner +claws-mail-plugins-bogofilter +claws-mail-plugins-cachesaver +claws-mail-plugins-fetchinfo +claws-mail-plugins-mailmbox +claws-mail-plugins-newmail +claws-mail-plugins-notification +claws-mail-plugins-pgp +claws-mail-plugins-rssyl +claws-mail-plugins-smime +claws-mail-plugins-spam-report +claws-mail-plugins-tnef +claws-mail-plugins-vcalendar xfburn liferea quodlibet From 45e611754b54c06553ebe347b6df82d7f9917f09 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 23 Jul 2009 09:24:18 -0400 Subject: [PATCH 08/24] Include PackageKit-command-not-found --- fedora-livecd-desktop.ks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 5491bf2..6e1f14c 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -62,6 +62,9 @@ festvox-slt-arctic-hts -system-config-services -policycoreutils-gui +# use the PackageKit helper for bash +PackageKit-command-not-found + %end %post From db63e36504ab24edcda86fa7a0579d992b67dada Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 23 Jul 2009 14:40:52 -0400 Subject: [PATCH 09/24] Debrand desktop spins by default --- fedora-livecd-desktop.ks | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 6e1f14c..989d976 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -65,6 +65,10 @@ festvox-slt-arctic-hts # use the PackageKit helper for bash PackageKit-command-not-found +# debrand test spins. Remove this for official releases ! +-fedora-logos +generic-logos + %end %post From 3017558e21ce17bade37c822a1514f461a3e1eff Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 Jul 2009 13:07:09 -0400 Subject: [PATCH 10/24] Add a note about debranding --- fedora-livecd-desktop.ks | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 989d976..48b0a33 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -2,6 +2,12 @@ # http://fedoraproject.org/wiki/SIGs/Desktop # mailto:fedora-desktop-list@redhat.com +# NOTE! +# +# This kickstart file is non-branded to facilitate doing test spins +# without trademark complications. You NEED to remove the debranding +# lines below when doing official spins. + %include fedora-live-base.ks %packages From 15ceaebd2b476447bbcd647c4ee4f72364555eff Mon Sep 17 00:00:00 2001 From: Igor Pires Soares Date: Tue, 28 Jul 2009 17:03:46 -0300 Subject: [PATCH 11/24] Remove deprecated packages references Remove references to totem-xine, paktype-fonts and kacst-fonts --- fedora-livecd-broffice.org.ks | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-livecd-broffice.org.ks b/fedora-livecd-broffice.org.ks index 34dadc1..6ebca5c 100644 --- a/fedora-livecd-broffice.org.ks +++ b/fedora-livecd-broffice.org.ks @@ -28,7 +28,6 @@ broffice.org-* # Include some desktop packages @java -totem-xine vino gnome-games system-config-display @@ -40,8 +39,6 @@ bitstream-vera-* -abyssinica-fonts -jomolhari-fonts -lohit-* --kacst-fonts --paktype-fonts -baekmuk-* -vlgothic-fonts-* -padauk-fonts From c60049a24cb2a0c444afe895cca575c800c4f5c5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 Jul 2009 17:51:10 -0400 Subject: [PATCH 12/24] Drop alacarte --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 48b0a33..0592540 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -50,6 +50,7 @@ festvox-slt-arctic-hts -evince-dvi -evince-djvu -krb5-auth-dialog +-alacarte # not needed for gnome -acpid -wget From f7ac815bc0e868d7a23b2c83eacf3c6ae0f54593 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 30 Jul 2009 00:58:23 -0400 Subject: [PATCH 13/24] Don't include seahorse --- fedora-livecd-desktop.ks | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 0592540..9382817 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -49,17 +49,18 @@ festvox-slt-arctic-hts -dasher -evince-dvi -evince-djvu --krb5-auth-dialog --alacarte -# not needed for gnome --acpid --wget # these pull in excessive dependencies -ekiga -tomboy -f-spot +# things we don't need here +-krb5-auth-dialog +-seahorse +-alacarte +-acpid + # drop some system-config things -system-config-boot -system-config-language From 62c2e6823e9e9b5938109579f661ada3a4de88b6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 1 Aug 2009 21:33:09 -0400 Subject: [PATCH 14/24] Remove a workaround for a long-fixed avahi bug --- fedora-live-base.ks | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 2f93845..1792e6d 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -23,11 +23,13 @@ services --enabled=NetworkManager --disabled=network,sshd #repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch # To compose against rawhide, use the following "repo" (disabled by default) -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +repo --name=rawhide --cost=10 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch + +repo --name=koji --cost=100 --baseurl=http://koji.fedoraproject.org/static-repos/dist-f12-build-current/$basearch # To compose against local trees, (edit and) use: #repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/ -#repo --name=f11-updates --baseurl=http://localrepo/fedora/updates/11/$basearch/ +repo --name=local --baseurl=file:///tmp/local %packages @base-x @@ -375,10 +377,6 @@ fi EOF -# workaround avahi segfault (#279301) -touch /etc/resolv.conf -/sbin/restorecon /etc/resolv.conf - chmod 755 /etc/rc.d/init.d/livesys /sbin/restorecon /etc/rc.d/init.d/livesys /sbin/chkconfig --add livesys From 6a9535e90ae904a74639b19a33641c7c5de2cc5a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Aug 2009 00:12:18 -0400 Subject: [PATCH 15/24] Drop krb5-workstation, along with krb5-auth-dialog --- fedora-livecd-desktop.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 9382817..c9f63ae 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -41,7 +41,6 @@ festvox-slt-arctic-hts -gimp-help-browser -gimp-data-extras -evolution-help --gnome-games -gnome-games-help -nss_db -vino @@ -57,6 +56,7 @@ festvox-slt-arctic-hts # things we don't need here -krb5-auth-dialog +-krb5-workstation -seahorse -alacarte -acpid From 296877999279e5baa1a7dbc29d7926c7e8a3cc58 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Aug 2009 01:49:15 -0400 Subject: [PATCH 16/24] Drop quota --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index c9f63ae..d5ba857 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -57,6 +57,7 @@ festvox-slt-arctic-hts # things we don't need here -krb5-auth-dialog -krb5-workstation +-quota -seahorse -alacarte -acpid From 1e5c02a38b99c44146a07ae78eba7d048e03396d Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Sun, 2 Aug 2009 22:28:40 +0200 Subject: [PATCH 17/24] revert to old edu spin concept (cd-size) --- fedora-livecd-education.ks | 108 ++++++++++++++++++++++++ fedora-livedvd-education.ks | 159 ------------------------------------ 2 files changed, 108 insertions(+), 159 deletions(-) create mode 100644 fedora-livecd-education.ks delete mode 100644 fedora-livedvd-education.ks diff --git a/fedora-livecd-education.ks b/fedora-livecd-education.ks new file mode 100644 index 0000000..3100a1d --- /dev/null +++ b/fedora-livecd-education.ks @@ -0,0 +1,108 @@ +# fedora-livecd-education.ks +# +# Description: +# - Fedora Live Spin with the purpose to create a ready-to-go +# development environment for contributing to educational +# projects inside, but also outside of the Fedora ecosystem. +# +# Maintainers: +# - Sebastian Dziallas +# - Fedora Education SIG + +%include fedora-live-base.ks + +# please don't forget to adjust the instLangs argument +# if you are going to create a localized spin +%packages --excludedocs --instLangs en_US + +# desktop environments +@sugar-desktop +@xfce-desktop + +# education +avogadro +kdeedu + +# internet +alpine +empathy +firefox + +# office +abiword +gnumeric +evince + +# graphics +blender +inkscape +gimp +mirage + +# audio & video +totem +totem-gstreamer +totem-mozplugin +-totem-xine +-xine-lib + +# others +geany +gnash-plugin + +# system +alsa-plugins-pulseaudio +desktop-backgrounds-compat +gnome-power-manager +liveusb-creator +NetworkManager-gnome +pavucontrol +setroubleshoot +xdg-user-dirs + +# remove imsettings-xfce for now until it gets re-written +-imsettings-xfce + +# dictionaries are big +-aspell-* +-hunspell-* +-man-pages-* +-words + +# exclude input methods +-scim* +-m17n* + +# save some space +-autofs +-nss_db +-sendmail +ssmtp +-acpid +-isdn4k-utils +-gimp-help +-gimp-help-browser + +%post + +# create /etc/sysconfig/desktop (needed for installation) +cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF +chown -R liveuser:liveuser /home/liveuser + +# disable screensaver locking +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null +# set up timed auto-login for after 60 seconds +cat >> /etc/gdm/custom.conf << FOE +[daemon] +TimedLoginEnable=true +TimedLogin=liveuser +TimedLoginDelay=60 +FOE + +EOF + +%end diff --git a/fedora-livedvd-education.ks b/fedora-livedvd-education.ks deleted file mode 100644 index d14603e..0000000 --- a/fedora-livedvd-education.ks +++ /dev/null @@ -1,159 +0,0 @@ -# fedora-livedvd-education.ks -# -# Description: -# - Fedora Live Spin with the purpose to create a ready-to-go -# development environment for contributing to educational -# projects inside, but also outside of the Fedora ecosystem. -# -# Maintainers: -# - Sebastian Dziallas -# - Fedora Education SIG - -%include fedora-live-base.ks - -# we need more space now -part / --size=8192 - -%packages - -# desktop environments -@gnome-desktop -@sugar-desktop -sugar-emulator - -# education -gnuplot -kdeedu -moodle -octave - -# internet -# education-bookmarks -firefox -java-1.6.0-openjdk-plugin -xchat-gnome - -# office -evince -openoffice.org-calc -openoffice.org-impress -openoffice.org-math -openoffice.org-writer - -# graphics -gimp -inkscape - -# audio & video -totem -totem-mozplugin - -# stuff to make sugar-jhbuild work out of the box -avahi-gobject-devel -avahi-tools -enchant-devel -fribidi-devel -icon-naming-utils -icon-slicer -libcroco-devel -libffi-devel -libgsf-devel -librsvg2-devel -loudmouth-devel -olpcsound-devel -poppler-glib-devel -python-distutils-extra -redhat-lsb -wv-devel -xulrunner-devel-unstable -xulrunner-python-devel - -# development -@development-libs -@development-tools -@fedora-packager -@gnome-software-development -giggle -numpy -pygame - -# eclipse environment -@eclipse -eclipse-eclox -# eclipse-texlipse - -# virtualization -@virtualization - -# additional removals from gnome --evolution --gok --gthumb --nautilus-sendto --orca --tomboy - -# remove some sugar packages --sugar-finance --sugar-help --sugar-xoirc --sugar-xomail - -# dictionaries are big --aspell-* --hunspell-* --man-pages-* --words - -# exclude input methods --scim* --m17n* - -# save some space --gnome-user-docs --nss_db --vino --isdn4k-utils --dasher --tomboy -# not needed for gnome --acpid - -%end - -%post - -cat >> /etc/rc.d/init.d/livesys << EOF - -# enable 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 true >/dev/null - -# disable screensaver locking -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null - -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -TimedLoginEnable=true -TimedLogin=liveuser -TimedLoginDelay=60 -FOE - -# create file for xchat default servers -mkdir -p /home/liveuser/.xchat-gnome - -cat >> /home/liveuser/.xchat-gnome/servlist_.conf << FOE -v=0.26.0 - -N=FreeNode -J=#fedora-edu,#sugar,#teachingopensource -F=3 -D=0 -S=irc.freenode.net -FOE - -chown liveuser:liveuser /home/liveuser/.xchat-gnome/servlist_.conf - -EOF - -%end From df41cf5b34e71a2ab5bbbb09c65df4e6448d1d08 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Aug 2009 00:32:02 -0400 Subject: [PATCH 18/24] More space saving measures --- fedora-livecd-desktop.ks | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index d5ba857..722cd91 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -48,6 +48,7 @@ festvox-slt-arctic-hts -dasher -evince-dvi -evince-djvu +-desktop-backgrounds-basic # these pull in excessive dependencies -ekiga @@ -55,12 +56,14 @@ festvox-slt-arctic-hts -f-spot # things we don't need here --krb5-auth-dialog --krb5-workstation --quota -seahorse -alacarte +-krb5-auth-dialog +-krb5-workstation +-pam_krb5 +-quota -acpid +-nano # drop some system-config things -system-config-boot @@ -74,6 +77,10 @@ festvox-slt-arctic-hts # use the PackageKit helper for bash PackageKit-command-not-found +# why does the obsoletes not work ?! +-lzma +xz-lzma-compat + # debrand test spins. Remove this for official releases ! -fedora-logos generic-logos From 986c7b7555d42b12474d15fa2c3b5a3f3d88f6a9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Aug 2009 12:31:14 -0400 Subject: [PATCH 19/24] Revert accidental %repo changes --- fedora-live-base.ks | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 1792e6d..f42e8ae 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -18,18 +18,15 @@ part / --size 3072 --fstype ext4 services --enabled=NetworkManager --disabled=network,sshd # To compose against the current release tree, use the following "repo" (enabled by default) -#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch +repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch # To include updates, use the following "repo" (enabled by default) -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch +repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch # To compose against rawhide, use the following "repo" (disabled by default) -repo --name=rawhide --cost=10 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch - -repo --name=koji --cost=100 --baseurl=http://koji.fedoraproject.org/static-repos/dist-f12-build-current/$basearch +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch # To compose against local trees, (edit and) use: #repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/ -repo --name=local --baseurl=file:///tmp/local %packages @base-x From 26f6a2b7acd11a1b09111e8a51c1a69c806a955a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Aug 2009 12:47:59 -0400 Subject: [PATCH 20/24] Enable rawhide by default --- fedora-live-base.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index f42e8ae..07f73c7 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -23,7 +23,7 @@ repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?re repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch # To compose against rawhide, use the following "repo" (disabled by default) -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch # To compose against local trees, (edit and) use: #repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/ From 2a473175ae6c858ac1b285db80b94a308ab658f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Aug 2009 13:00:53 -0400 Subject: [PATCH 21/24] more fixes for warren --- fedora-live-base.ks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 07f73c7..9c4e945 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -18,9 +18,9 @@ part / --size 3072 --fstype ext4 services --enabled=NetworkManager --disabled=network,sshd # To compose against the current release tree, use the following "repo" (enabled by default) -repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch +#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch # To include updates, use the following "repo" (enabled by default) -repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch +#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=$basearch # To compose against rawhide, use the following "repo" (disabled by default) repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch From 1fd5a7e512135769c12c768681e0e39461753fda Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Aug 2009 14:52:33 -0400 Subject: [PATCH 22/24] No need for smartmontools in the dekstop spin --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 722cd91..43e0c65 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -64,6 +64,7 @@ festvox-slt-arctic-hts -quota -acpid -nano +-smartmontools # drop some system-config things -system-config-boot From 219a9331f766b0a7a819e7072d3ec18dacc1d801 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Aug 2009 16:15:27 -0400 Subject: [PATCH 23/24] increasingly desperate attempts to save space... --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 43e0c65..0c99b0a 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -65,6 +65,7 @@ festvox-slt-arctic-hts -acpid -nano -smartmontools +-minicom # drop some system-config things -system-config-boot From e52931efa4630761655c68038808512e6c930b4e Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Mon, 3 Aug 2009 23:59:14 +0200 Subject: [PATCH 24/24] move to dvd-size for the education spin here --- fedora-livecd-education.ks | 108 ------------------------ fedora-livedvd-education.ks | 160 ++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 108 deletions(-) delete mode 100644 fedora-livecd-education.ks create mode 100644 fedora-livedvd-education.ks diff --git a/fedora-livecd-education.ks b/fedora-livecd-education.ks deleted file mode 100644 index 3100a1d..0000000 --- a/fedora-livecd-education.ks +++ /dev/null @@ -1,108 +0,0 @@ -# fedora-livecd-education.ks -# -# Description: -# - Fedora Live Spin with the purpose to create a ready-to-go -# development environment for contributing to educational -# projects inside, but also outside of the Fedora ecosystem. -# -# Maintainers: -# - Sebastian Dziallas -# - Fedora Education SIG - -%include fedora-live-base.ks - -# please don't forget to adjust the instLangs argument -# if you are going to create a localized spin -%packages --excludedocs --instLangs en_US - -# desktop environments -@sugar-desktop -@xfce-desktop - -# education -avogadro -kdeedu - -# internet -alpine -empathy -firefox - -# office -abiword -gnumeric -evince - -# graphics -blender -inkscape -gimp -mirage - -# audio & video -totem -totem-gstreamer -totem-mozplugin --totem-xine --xine-lib - -# others -geany -gnash-plugin - -# system -alsa-plugins-pulseaudio -desktop-backgrounds-compat -gnome-power-manager -liveusb-creator -NetworkManager-gnome -pavucontrol -setroubleshoot -xdg-user-dirs - -# remove imsettings-xfce for now until it gets re-written --imsettings-xfce - -# dictionaries are big --aspell-* --hunspell-* --man-pages-* --words - -# exclude input methods --scim* --m17n* - -# save some space --autofs --nss_db --sendmail -ssmtp --acpid --isdn4k-utils --gimp-help --gimp-help-browser - -%post - -# create /etc/sysconfig/desktop (needed for installation) -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF -chown -R liveuser:liveuser /home/liveuser - -# disable screensaver locking -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -TimedLoginEnable=true -TimedLogin=liveuser -TimedLoginDelay=60 -FOE - -EOF - -%end diff --git a/fedora-livedvd-education.ks b/fedora-livedvd-education.ks new file mode 100644 index 0000000..701dbb0 --- /dev/null +++ b/fedora-livedvd-education.ks @@ -0,0 +1,160 @@ +# fedora-livedvd-education.ks +# +# Description: +# - Fedora Live Spin with the purpose to create a ready-to-go +# development environment for contributing to educational +# projects inside, but also outside of the Fedora ecosystem. +# +# Maintainers: +# - Sebastian Dziallas +# - Fedora Education SIG + +%include fedora-live-base.ks + +# we need more space now +part / --size=8192 + +%packages + +# desktop environments +@gnome-desktop +@sugar-desktop +sugar-emulator + +# education +gnuplot +kdeedu +moodle +octave + +# internet +# education-bookmarks +firefox +java-1.6.0-openjdk-plugin +xchat-gnome + +# office +evince +openoffice.org-calc +openoffice.org-impress +openoffice.org-math +openoffice.org-writer + +# graphics +gimp +inkscape + +# audio & video +totem +totem-mozplugin + +# stuff to make sugar-jhbuild work out of the box +avahi-gobject-devel +avahi-tools +enchant-devel +fribidi-devel +icon-naming-utils +icon-slicer +libcroco-devel +libffi-devel +libgsf-devel +librsvg2-devel +loudmouth-devel +olpcsound-devel +poppler-glib-devel +python-distutils-extra +redhat-lsb +wv-devel +xulrunner-devel-unstable +xulrunner-python-devel + +# development +@development-libs +@development-tools +@fedora-packager +@gnome-software-development +giggle +numpy +pygame + +# eclipse environment +@eclipse +eclipse-eclox +# eclipse-texlipse + +# virtualization +@virtualization + +# additional removals from gnome +-evolution +-gok +-gthumb +-nautilus-sendto +-orca +-tomboy + +# remove some sugar packages +-sugar-finance +-sugar-help +-sugar-xoirc +-sugar-xomail + +# dictionaries are big +-aspell-* +-hunspell-* +-man-pages-* +-words + +# exclude input methods +-scim* +-m17n* + +# save some space +-gnome-user-docs +-nss_db +-vino +-isdn4k-utils +-dasher +-tomboy +# not needed for gnome +-acpid + +%end + +%post + +cat >> /etc/rc.d/init.d/livesys << EOF + +# enable 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 true >/dev/null + +# disable screensaver locking +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null + +# set up timed auto-login for after 60 seconds +cat >> /etc/gdm/custom.conf << FOE +[daemon] +TimedLoginEnable=true +TimedLogin=liveuser +TimedLoginDelay=60 +FOE + +# create file for xchat default servers +mkdir -p /home/liveuser/.xchat-gnome + +cat >> /home/liveuser/.xchat-gnome/servlist_.conf << FOE +v=0.26.0 + +N=FreeNode +J=#fedora-edu,#sugar,#teachingopensource +F=3 +D=0 +S=irc.freenode.net +FOE + +chown liveuser:liveuser /home/liveuser/.xchat-gnome/servlist_.conf + +EOF + +%end +