diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-05 13:28:24 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-05 13:28:24 -0600 |
commit | cd20bd0bb55ec383cf4cdeaad16eb23512e91206 (patch) | |
tree | 6c755a18c8bd51e26eadd07632bf92fbefc5f848 /redhat/extras/trinity-live/fedora-live-tde-base.ks | |
parent | 629156d239e0489a18a167ab770be3ae6087a647 (diff) | |
parent | c99e2aca485d146337b087cdb0876e82fe5030d8 (diff) | |
download | tde-packaging-cd20bd0bb55ec383cf4cdeaad16eb23512e91206.tar.gz tde-packaging-cd20bd0bb55ec383cf4cdeaad16eb23512e91206.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/extras/trinity-live/fedora-live-tde-base.ks')
-rw-r--r-- | redhat/extras/trinity-live/fedora-live-tde-base.ks | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks index ed912dfff..827a0b2bf 100644 --- a/redhat/extras/trinity-live/fedora-live-tde-base.ks +++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks @@ -51,7 +51,7 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon fi -# make liveuser use KDE +# make liveuser use TDE echo "/opt/trinity/bin/startkde" > /home/liveuser/.xsession chmod a+x /home/liveuser/.xsession chown liveuser:liveuser /home/liveuser/.xsession @@ -95,19 +95,9 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink EOF +### TDE LIVECD specific features ### + # Sets 'nm-applet' to run automatically -mkdir -p /home/liveuser/.trinity/Autostart -cat <<EOF >/home/liveuser/.trinity/Autostart/nm-applet -#!/bin/sh - -# Waits until kicker is started, so that -# nm-applet can dock correctly. -while ! pidof kicker; do - sleep 1 -done -sleep 3 -/usr/bin/nm-applet -EOF -chmod +x /home/liveuser/.trinity/Autostart/nm-applet +ln -sf /usr/share/applications/nm-applet.desktop /opt/trinity/share/autostart/nm-applet.desktop %end |