RHEL/Fedora: fixes

2 files changed, 33 insertions, 4 deletions

diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/trinity-live/fedora-live-tde-base.ks
index b56e5c92a..ed912dfff 100644
--- a/redhat/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/trinity-live/fedora-live-tde-base.ks
@@ -9,8 +9,11 @@ repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$rel
 %packages
 
 ### The KDE-Desktop
-
 trinity-desktop
+hal
+
+# TDE is missing a Network Applet, so we use Gnome...
+NetworkManager-gnome
 
 
 ### fixes
@@ -81,6 +84,7 @@ touch /usr/share/icons/hicolor/
 
 # Create user Desktop directory
 mkdir -p /home/liveuser/Desktop
+mkdir -p /home/liveuser/Documents
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
@@ -91,4 +95,19 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
 
 EOF
 
+# 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
+
 %end
diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/trinity-live/fedora-livecd-tde.ks
index 16c799d1f..88ab2f91a 100644
--- a/redhat/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/trinity-live/fedora-livecd-tde.ks
@@ -10,6 +10,9 @@
 %include fedora-live-tde-base.ks
 %include fedora-live-minimization.ks
 
+# 3rd party for VLC
+#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable
+
 
 %packages
 # Additional packages that are not default in trinity-desktop but useful
@@ -18,12 +21,13 @@ trinity-live-openbox
 
 # Some TDE applications
 trinity-amarok
-trinity-digikam
+#trinity-digikam
 trinity-dolphin
 trinity-gwenview
 trinity-k3b
 trinity-kaffeine
 trinity-kbookreader
+#trinity-knetworkmanager
 trinity-konversation
 trinity-ksensors
 trinity-kstreamripper
@@ -31,13 +35,19 @@ trinity-yakuake
 
 # Some TDE translations
 trinity-kde-i18n-French
-trinity-kde-i18n-German
-#trinity-kde-i18n-Spanish
+#trinity-kde-i18n-German
+trinity-kde-i18n-Spanish
 trinity-kde-i18n-Chinese-Big5
 
+# 3rd party stuff
+#vlc
+
 # Fedora stuff
 fuse
 liveusb-creator
+#wlassistant
+#wicd
+#wicd-gtk
 
 
 ### more desktop stuff