From 0b1a3bc1fe451866811c02aeaabde0a93530e427 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 12 Jun 2011 17:12:06 +0200
Subject: [PATCH] makedist.inc.sh: move /tmp cleanup code after
 post_install_rpms livecd, livedvd: use kickoffcfg to configure firefox,
 kaffeine and amarok as KDE favorite apps

---
 makedist.inc.sh                    | 7 ++++---
 platforms/livecd-root/post.inc.sh  | 4 +++-
 platforms/livedvd-root/post.inc.sh | 5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index 0661ee5..0ab6755 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -105,9 +105,6 @@ find $MOUNTDIR/usr/share/locale \
  -maxdepth 1 -mindepth 1 -type d \
 ! -name it* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \;
 
-# cleanup: prevent generating a cleanfs script crash due to a unionfs bug
-rm -rf $MOUNTDIR/tmp/.ICE-unix
-rm -rf $MOUNTDIR/tmp/kde-root
 
 #$CHROOTCMD chkconfig --add acpid ||
 #   { echo "$mkcd_me: fatal error, aborting installation" >&2
@@ -148,6 +145,10 @@ fi
 
 post_install_rpms
 
+# cleanup: prevent generating a cleanfs script crash due to a unionfs bug
+rm -rf $MOUNTDIR/tmp/.ICE-unix
+rm -rf $MOUNTDIR/tmp/kde-root
+
 [ "$QEMU_COPIED_FOR_INST" ] && post_qemu
 
 # copy static files for target
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index 695d7fb..0ed6160 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -62,7 +62,9 @@ cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/D
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
 # configure firefox as favorite in kde menu
-chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite /usr/share/applications/mozilla-firefox3.desktop
+for f in /usr/share/applications/mozilla-firefox3.desktop /opt/kde/share/applications/kaffeine.desktop; do
+   chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
+done
 
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh
index 76928ef..ffddfe5 100644
--- a/platforms/livedvd-root/post.inc.sh
+++ b/platforms/livedvd-root/post.inc.sh
@@ -63,7 +63,10 @@ cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/D
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
 # configure firefox as favorite in kde menu
-chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite /usr/share/applications/mozilla-firefox3.desktop
+for f in /usr/share/applications/mozilla-firefox3.desktop \
+         /opt/kde/share/applications/kaffeine.desktop /opt/kde/share/applications/amarok.desktop; do
+   chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
+done
 
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`