Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts

This commit is contained in:
Jeroen van Meeuwen (Fedora Unity) 2008-08-03 12:49:52 +02:00
commit 49b97923c8
16 changed files with 262 additions and 22 deletions

View File

@ -1,11 +1,11 @@
# Fedora EDU Math # Fedora Education Math
# #
# Filename: # Filename:
# fedora-livecd-education-math.ks # fedora-livecd-education-math.ks
# Version:
# beta 1
# Description: # Description:
# Fedora Live Spin including mainly software for educational & mathematical purposes # Fedora Live Spin including mainly software for educational & mathematical purposes
# Known Issues:
# # 456299: user is not able to log in after having installed the spin due to problems with kdm / generic-logos
# Maintainers: # Maintainers:
# Sebastian Dziallas <sdz AT fedoraproject DOT org> # Sebastian Dziallas <sdz AT fedoraproject DOT org>
# Fedora Education SIG # Fedora Education SIG
@ -133,7 +133,7 @@ sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
# add liveinst.desktop to favorites menu # add apps to favorites menu
mkdir -p /home/fedora/.kde/share/config/ mkdir -p /home/fedora/.kde/share/config/
cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
[Favorites] [Favorites]
@ -141,7 +141,13 @@ FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applica
MENU_EOF MENU_EOF
chown -R fedora:fedora /home/fedora/.kde/ chown -R fedora:fedora /home/fedora/.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 # workaround to start nm-applet automatically
cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/ cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/
# fix issues with unbranding
sed -i -e "s/Fedora/Generic/g" /etc/fedora-release
%end %end

View File

@ -1,24 +1,31 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%packages %packages
@kde-desktop
# include nm-applet directly @kde-desktop
NetworkManager-gnome
# unwanted packages from @kde-desktop # unwanted packages from @kde-desktop
# don't include these for now to fit on a cd # don't include these for now to fit on a cd
# digikam (~11 megs), ktorrent (~3 megs), amarok (~14 megs),
# kdegames (~23 megs)
-amarok
-digikam
-kdeedu
-scribus
#-ktorrent
#-kdegames
#-kftpgrabber*
# KDE 3 ### amarok has duplicate functionality with juk (~14 megs)
#-amarok
### digikam has duplicate functionality with gwenview (~11 megs)
-digikam
### kdeedu is too big for the live images
-kdeedu
### scribus is too big for the live images
-scribus
### kget has also basic torrent features (~3 megs)
-ktorrent
### konqueror is also able to browse ftp shares (~1 megs)
#-kftpgrabber*
### kaffeine has duplicate functionality with dragonplayer (~3 megs)
-kaffeine*
### the removal of kdegames will free ~31 megs
#-kdegames
# Useful additional KDE3 applications
koffice-kword koffice-kword
koffice-kspread koffice-kspread
koffice-kpresenter koffice-kpresenter
@ -28,8 +35,11 @@ filelight
# twinkle (~10 megs) # twinkle (~10 megs)
#twinkle #twinkle
# some extras # some extras
fuse fuse
pavucontrol
# additional fonts # additional fonts
@fonts @fonts
@ -40,6 +50,7 @@ fonts-KOI8-R
fonts-KOI8-R-100dpi fonts-KOI8-R-100dpi
tibetan-machine-uni-fonts tibetan-machine-uni-fonts
# FIXME/TODO: recheck the removals here # FIXME/TODO: recheck the removals here
# try to remove some packages from fedora-live-base.ks # try to remove some packages from fedora-live-base.ks
-gdm -gdm
@ -90,4 +101,9 @@ FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applica
MENU_EOF MENU_EOF
chown -R fedora:fedora /home/fedora/.kde/ chown -R fedora:fedora /home/fedora/.kde/
# show liveinst.desktop on and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
EOF
%end %end

12
snippets/autologin-gdm.ks Normal file
View File

@ -0,0 +1,12 @@
# %post modifications for gdm
cat >> /etc/rc.d/init.d/fedora-live << EOF
chown -R fedora:fedora /home/fedora
sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
chown fedora:fedora /home/fedora/.face
# TODO: would be nice to get e-d-s to pick this one up too... but how?
fi
EOF

33
snippets/autologin-kdm.ks Normal file
View File

@ -0,0 +1,33 @@
# %post modifications for kdm and kde
# add initscript
cat >> /etc/rc.d/init.d/fedora-live << 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/fedora/.xsession
chmod a+x /home/fedora/.xsession
chown fedora:fedora /home/fedora/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /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=fedora/' /etc/kde/kdm/kdmrc
# add liveinst.desktop to favorites menu
mkdir -p /home/fedora/.kde/share/config/
cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
[Favorites]
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
chown -R fedora:fedora /home/fedora/.kde/
EOF

View File

@ -0,0 +1,7 @@
# %post modifications to add link to demonstration videos to desktop
cat >> /etc/rc.d/init.d/fedora-live << EOF
pushd /home/fedora/Desktop
ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
popd
EOF

View File

@ -0,0 +1,57 @@
# %post modifications specifically for Fedora Electronic Lab
# Fedora Electronic Lab: Kwin buttons
cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
[Style]
ButtonsOnLeft=MB
ButtonsOnRight=FIAX
CustomButtonPositions=true
EOF
# kill klipper
cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
[General]
AutoStart=false
EOF
# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
[Digital]
LCD_Style=false
Show_Date=false
Show_Seconds=true
[General]
Type=Digital
EOF
cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
[Layout]
DisplayNames=
EnableXkbOptions=false
IncludeGroups=
LayoutList=us,de,fr,jp
Model=pc104
Options=
ResetOldOptions=false
ShowFlag=true
ShowSingle=true
StickySwitching=false
StickySwitchingDepth=2
SwitchMode=Global
Use=true
EOF
# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
# This is a feature for Fedora and not for KDE
cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
/sbin/chkconfig anacron off
/sbin/chkconfig sendmail off
/sbin/chkconfig nfs off
/sbin/chkconfig nfslock off
/sbin/chkconfig rpcidmapd off
/sbin/chkconfig rpcbind off

View File

@ -0,0 +1,19 @@
# %post modifications to set up gnome-keyring in KDE
mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
cat > /etc/skel/.kde/env/start-custom.sh << EOF
#!/bin/sh
eval \`gnome-keyring-daemon\`
export GNOME_KEYRING_PID
export GNOME_KEYRING_SOCKET
EOF
chmod 755 /etc/skel/.kde/env/start-custom.sh
cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
#/bin/sh
if [-n "$GNOME_KEYRING_PID"]; then
kill $GNOME_KEYRING_PID
fi
EOF
chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh

View File

@ -0,0 +1,16 @@
# %post modifications to configure tracker search
mkdir -p /home/fedora/.config/tracker
cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
[Indexing]
EnableIndexing=false
Language=en
EOF
mkdir -p /root/.config/tracker
cat > /root/.config/tracker/tracker.cfg <<EOF
[Indexing]
EnableIndexing=false
Language=en
EOF

View File

@ -0,0 +1,25 @@
# %post modifications to enable debuginfo repository
awk '
BEGIN {
debuginfo = 0
}
/^\[.*\]/ {
if (/debuginfo/) {
debuginfo = 1
} else {
debuginfo = 0
}
print
next
}
/enabled=0/ && debuginfo {
print "enabled=1"
next
}
{
print
next
}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
mv /etc/yum.repos.d/fedora.repo{.tmp,}

View File

@ -0,0 +1,5 @@
# %post modifications to disable GNOME screensaver locking
cat >> /etc/rc.d/init.d/fedora-live << EOF
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
EOF

View File

@ -0,0 +1,3 @@
# %post modifications to disable KDE screensaver
sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc

View File

@ -0,0 +1,6 @@
# %post modifications to create /etc/sysconfig/desktop for KDE
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF

View File

@ -0,0 +1,5 @@
# %post modifications to create /etc/sysconfig/desktop for XFCE
cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startxfce4
EOF

View File

@ -0,0 +1,10 @@
# %post language-modifications for de_DE-spins
# system-config-keyboard doesn't really work (missing xorg.conf etc)
cat >>/etc/X11/xorg.conf << EOF
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Option "XkbLayout" "de-latin1-nodeadkeys"
EndSection
EOF

View File

@ -0,0 +1,10 @@
# %post language-modifications for pt_BR-spins
# system-config-keyboard doesn't really work (missing xorg.conf etc)
cat >>/etc/X11/xorg.conf << EOF
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Option "XkbLayout" "br-abnt2"
EndSection
EOF

View File

@ -0,0 +1,10 @@
# %post language-modifications for pt_PT-spins
# system-config-keyboard doesn't really work (missing xorg.conf etc)
cat >>/etc/X11/xorg.conf << EOF
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
Option "XkbLayout" "pt-latin1"
EndSection
EOF