From 92a9839cc63d6e297f02e8382b2dc1cd697aa165 Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Wed, 4 Mar 2009 17:16:16 +0100 Subject: [PATCH] replace Edu Math with Education Spin --- Makefile.am | 2 +- fedora-livecd-education-math.ks | 146 -------------------------------- fedora-livecd-education.ks | 106 +++++++++++++++++++++++ 3 files changed, 107 insertions(+), 147 deletions(-) delete mode 100644 fedora-livecd-education-math.ks create mode 100644 fedora-livecd-education.ks diff --git a/Makefile.am b/Makefile.am index a247ded..33d98d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ kickstart_DATA = \ fedora-livecd-desktop-nl_NL.ks \ fedora-livecd-desktop-pt_BR.ks \ fedora-livecd-desktop-pt_PT.ks \ - fedora-livecd-education-math.ks \ + fedora-livecd-education.ks \ fedora-livecd-kde.ks \ fedora-livecd-kde-de_CH.ks \ fedora-livecd-kde-de_DE.ks \ diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks deleted file mode 100644 index 0770b1c..0000000 --- a/fedora-livecd-education-math.ks +++ /dev/null @@ -1,146 +0,0 @@ -# Fedora Education Math -# -# Filename: -# fedora-livecd-education-math.ks -# Description: -# Fedora Live Spin including mainly software for educational & mathematical purposes -# Maintainers: -# Sebastian Dziallas -# Fedora Education SIG -# Acknowledgements: -# Rex Dieter -# Thorsten Leemhuis - -%include fedora-live-base.ks - -%packages - -# KDE packages -desktop-backgrounds-basic -guidance-power-manager -kdebase -kdegraphics -kdemultimedia -kdeutils -# koffice-kpresenter -# koffice-kspread -# koffice-kword -kde-settings-pulseaudio -NetworkManager-gnome - -# additional office packages -# koffice pulls in kdelibs3 -abiword -gnumeric - -# mathematical apps selected by the SIG -kdeedu-math -qalculate-gtk -wxMaxima -octave -gnuplot -Macaulay2 -orpie - -# some extras -fuse -# pavucontrol - -# additional fonts -# @fonts -# fonts-ISO8859-2 -# cjkunifonts-ukai -# madan-fonts -# fonts-KOI8-R -# fonts-KOI8-R-100dpi -# tibetan-machine-uni-fonts --abyssinica-fonts --cjkunifonts-uming --baekmuk-ttf-fonts-gulim --jomolhari-fonts --kacst-fonts --paktype-fonts --lklug-fonts --lohit-fonts-* --thaifonts-scalable --VLGothic-fonts - -# FIXME/TODO: recheck the removals here -# try to remove some packages from livecd-fedora-base-desktop.ks --gdm --authconfig-gtk --PolicyKit-gnome --gnome-doc-utils-stylesheets --pygtkglext --python-devel -# exclude input methods --scim* --m17n* - -# save some space (from @base) --make --nss_db --autofs - -# -@dial-up --isdn4k-utils --lrzsz --rp-pppoe --minicom --wvdial - -# misc --comps-extras --gutenprint --gutenprint-foomatic --jwhois --rdist --rdate - -%end - -%post - -# create /etc/sysconfig/desktop (needed for installation) -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF - -if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then - # use image also for kdm - mkdir -p /usr/share/apps/kdm/faces - cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon -fi - -# make fedora user use KDE -echo "startkde" > /home/liveuser/.xsession -chmod a+x /home/liveuser/.xsession -chown liveuser:liveuser /home/liveuser/.xsession - -# set up autologin for user fedora -sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc -sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc - -# set up user fedora as default user and preselected user -sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc -sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc - -# add apps to favorites menu -mkdir -p /home/liveuser/.kde/share/config/ -cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF -chown -R liveuser:liveuser /home/liveuser/.kde/ - -# show liveinst.desktop on and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop - -# workaround to start nm-applet automatically -cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/ - -%end diff --git a/fedora-livecd-education.ks b/fedora-livecd-education.ks new file mode 100644 index 0000000..813b7b5 --- /dev/null +++ b/fedora-livecd-education.ks @@ -0,0 +1,106 @@ +# 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