openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makedist.inc.sh: move /tmp cleanup code after post_install_rpms

Browse Source 
livecd, livedvd: use kickoffcfg to configure firefox, kaffeine and amarok as KDE favorite apps
This commit is contained in:
Silvan Calarco 2011-06-12 17:12:06 +02:00
parent 2136019aab
commit 0b1a3bc1fe
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makedist.inc.sh
View File

@ -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

4
platforms/livecd-root/post.inc.sh
View File

@ -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`

5
platforms/livedvd-root/post.inc.sh
View File

@ -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`