From 556776c4549c842383d648ff2421d639fa7889ae Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Tue, 22 Jul 2008 19:30:35 +0200 Subject: [PATCH 1/4] Modify Education Math spin - Fix issues with rebranding and installation --- fedora-livecd-education-math.ks | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks index b39b749..cb9f2ec 100755 --- a/fedora-livecd-education-math.ks +++ b/fedora-livecd-education-math.ks @@ -1,9 +1,7 @@ -# Fedora EDU Math +# Fedora Education Math # # Filename: # fedora-livecd-education-math.ks -# Version: -# beta 1 # Description: # Fedora Live Spin including mainly software for educational & mathematical purposes # Maintainers: @@ -133,15 +131,19 @@ 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/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc -# add liveinst.desktop to favorites menu +# add apps to favorites menu +# known issue: /usr/share/applications/liveinst.desktop has been removed due to issues with kdm and generic-logos 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/liveinst.desktop +FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop MENU_EOF chown -R fedora:fedora /home/fedora/.kde/ # workaround to start nm-applet automatically cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/ +# fix issues with unbranding +sed -i -e "s/Fedora/Generic/g" /etc/fedora-rel + %end From 07fc4ad634d3fe0dc1a8aa0bbdbcdde3b3e5cd63 Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Tue, 22 Jul 2008 19:42:07 +0200 Subject: [PATCH 2/4] Add "known issues" to Education Math spin - Correct spelling error --- fedora-livecd-education-math.ks | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks index cb9f2ec..0e9a3f4 100755 --- a/fedora-livecd-education-math.ks +++ b/fedora-livecd-education-math.ks @@ -4,6 +4,8 @@ # fedora-livecd-education-math.ks # Description: # Fedora Live Spin including mainly software for educational & mathematical purposes +# Known Issues: +# * user is not able to log in after having installed the spin due to problems with kdm / generic-logos # Maintainers: # Sebastian Dziallas # Fedora Education SIG @@ -132,11 +134,10 @@ sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc # add apps to favorites menu -# known issue: /usr/share/applications/liveinst.desktop has been removed due to issues with kdm and generic-logos 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 +FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/liveinst.desktop MENU_EOF chown -R fedora:fedora /home/fedora/.kde/ @@ -144,6 +145,6 @@ chown -R fedora:fedora /home/fedora/.kde/ cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/ # fix issues with unbranding -sed -i -e "s/Fedora/Generic/g" /etc/fedora-rel +sed -i -e "s/Fedora/Generic/g" /etc/fedora-release %end From a86bc1466f30a4c134b4c9c56c8e599bab9cf749 Mon Sep 17 00:00:00 2001 From: Sebastian Vahl Date: Wed, 23 Jul 2008 11:13:08 +0200 Subject: [PATCH 3/4] Prepare fedora-livecd-kde.ks for F10 Alpha --- fedora-livecd-kde.ks | 52 +++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 552cbdb..73619bc 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -1,24 +1,31 @@ %include fedora-live-base.ks %packages -@kde-desktop -# include nm-applet directly -NetworkManager-gnome +@kde-desktop # unwanted packages from @kde-desktop # 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-kspread koffice-kpresenter @@ -28,18 +35,22 @@ filelight # twinkle (~10 megs) #twinkle + # some extras fuse +pavucontrol + # additional fonts @fonts -fonts-ISO8859-2 -#cjkunifonts-ukai -madan-fonts -fonts-KOI8-R -fonts-KOI8-R-100dpi +fonts-ISO8859-2 +#cjkunifonts-ukai +madan-fonts +fonts-KOI8-R +fonts-KOI8-R-100dpi tibetan-machine-uni-fonts + # FIXME/TODO: recheck the removals here # try to remove some packages from fedora-live-base.ks -gdm @@ -90,4 +101,9 @@ FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applica MENU_EOF 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 From 00b1391df5e8f7e738f08f27c3fa6268823e3274 Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Fri, 25 Jul 2008 11:11:26 +0200 Subject: [PATCH 4/4] Add snippets and templates - Fix Education Math spin --- fedora-livecd-education-math.ks | 5 ++- snippets/autologin-gdm.ks | 12 ++++++ snippets/autologin-kdm.ks | 33 ++++++++++++++++ snippets/config-developer.ks | 7 ++++ snippets/config-electronic-lab.ks | 57 ++++++++++++++++++++++++++++ snippets/config-kde-gnome-keyring.ks | 19 ++++++++++ snippets/config-tracker.ks | 16 ++++++++ snippets/repository-debuginfo.ks | 25 ++++++++++++ snippets/screensaver-gnome.ks | 5 +++ snippets/screensaver-kde.ks | 3 ++ snippets/sysconfig-kde.ks | 6 +++ snippets/sysconfig-xfce.ks | 5 +++ templates/language-de_DE.ks | 10 +++++ templates/language-pt_BR.ks | 10 +++++ templates/language-pt_PT.ks | 10 +++++ 15 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 snippets/autologin-gdm.ks create mode 100644 snippets/autologin-kdm.ks create mode 100644 snippets/config-developer.ks create mode 100644 snippets/config-electronic-lab.ks create mode 100644 snippets/config-kde-gnome-keyring.ks create mode 100644 snippets/config-tracker.ks create mode 100644 snippets/repository-debuginfo.ks create mode 100644 snippets/screensaver-gnome.ks create mode 100644 snippets/screensaver-kde.ks create mode 100644 snippets/sysconfig-kde.ks create mode 100644 snippets/sysconfig-xfce.ks create mode 100644 templates/language-de_DE.ks create mode 100644 templates/language-pt_BR.ks create mode 100644 templates/language-pt_PT.ks diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks index 0e9a3f4..d8ee3d0 100755 --- a/fedora-livecd-education-math.ks +++ b/fedora-livecd-education-math.ks @@ -5,7 +5,7 @@ # Description: # Fedora Live Spin including mainly software for educational & mathematical purposes # Known Issues: -# * user is not able to log in after having installed the spin due to problems with kdm / generic-logos +# # 456299: user is not able to log in after having installed the spin due to problems with kdm / generic-logos # Maintainers: # Sebastian Dziallas # Fedora Education SIG @@ -141,6 +141,9 @@ FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applica MENU_EOF 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 cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/ diff --git a/snippets/autologin-gdm.ks b/snippets/autologin-gdm.ks new file mode 100644 index 0000000..cf23273 --- /dev/null +++ b/snippets/autologin-gdm.ks @@ -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 + diff --git a/snippets/autologin-kdm.ks b/snippets/autologin-kdm.ks new file mode 100644 index 0000000..d19b42a --- /dev/null +++ b/snippets/autologin-kdm.ks @@ -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 + diff --git a/snippets/config-developer.ks b/snippets/config-developer.ks new file mode 100644 index 0000000..e1b6e3f --- /dev/null +++ b/snippets/config-developer.ks @@ -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 diff --git a/snippets/config-electronic-lab.ks b/snippets/config-electronic-lab.ks new file mode 100644 index 0000000..2c2c937 --- /dev/null +++ b/snippets/config-electronic-lab.ks @@ -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 < /usr/share/kde-settings/kde-profile/default/share/config/klipperrc < /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc < /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc < /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 diff --git a/snippets/config-tracker.ks b/snippets/config-tracker.ks new file mode 100644 index 0000000..d65ed43 --- /dev/null +++ b/snippets/config-tracker.ks @@ -0,0 +1,16 @@ +# %post modifications to configure tracker search + +mkdir -p /home/fedora/.config/tracker + +cat > /home/fedora/.config/tracker/tracker.cfg < /root/.config/tracker/tracker.cfg < /etc/yum.repos.d/fedora.repo.tmp +mv /etc/yum.repos.d/fedora.repo{.tmp,} + diff --git a/snippets/screensaver-gnome.ks b/snippets/screensaver-gnome.ks new file mode 100644 index 0000000..f13c84a --- /dev/null +++ b/snippets/screensaver-gnome.ks @@ -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 diff --git a/snippets/screensaver-kde.ks b/snippets/screensaver-kde.ks new file mode 100644 index 0000000..17928d4 --- /dev/null +++ b/snippets/screensaver-kde.ks @@ -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 diff --git a/snippets/sysconfig-kde.ks b/snippets/sysconfig-kde.ks new file mode 100644 index 0000000..dfe857e --- /dev/null +++ b/snippets/sysconfig-kde.ks @@ -0,0 +1,6 @@ +# %post modifications to create /etc/sysconfig/desktop for KDE + +cat > /etc/sysconfig/desktop < /etc/sysconfig/desktop <>/etc/X11/xorg.conf << EOF +Section "InputDevice" + Identifier "Keyboard0" + Driver "kbd" + Option "XkbLayout" "de-latin1-nodeadkeys" +EndSection +EOF diff --git a/templates/language-pt_BR.ks b/templates/language-pt_BR.ks new file mode 100644 index 0000000..b7c2e25 --- /dev/null +++ b/templates/language-pt_BR.ks @@ -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 diff --git a/templates/language-pt_PT.ks b/templates/language-pt_PT.ks new file mode 100644 index 0000000..8befa2f --- /dev/null +++ b/templates/language-pt_PT.ks @@ -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