From 67a6f3943c5ba03f5fe35201df16651b25696822 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 11 Jan 2013 16:51:19 -0600
Subject: set E as the default WM for CD installs

---
 .../mythvantage/root-image/root/LinHES-install.sh    | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh b/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh
index 704112d..2b0cdb2 100755
--- a/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh
+++ b/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh
@@ -8,11 +8,20 @@ exec > /tmp/mythvantage_install.log
 #/usr/bin/tilda &
 #/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents  &
 export MALLOC_CHECK_=0
+
+WM="e16 -P /usr/share/wm_data/e16_config_dir/"
+$WM &
+pid=$!
+
 xset s off
 xset -dpms
 xhost +
 xdotool mousemove 0 0
 
+cp -f /etc/keylaunchrc /root/.keylaunchrc
+/usr/bin/keylaunch &
+
+
 CMDLINE=$(cat /proc/cmdline)
 echo $CMDLINE |grep -q nfsroot
 NFSROOT=$?
@@ -23,6 +32,8 @@ then
 else
 	export CLEAN_UPGRADE=NO
 fi
+
+#show the readme
 MythVantage -r
 
 if  [ x$NFSROOT = x1  ]
@@ -31,9 +42,8 @@ then
 else
     NETBOOT=YES     MythVantage &
 fi
-cp -f /etc/keylaunchrc /root/.keylaunchrc
-/usr/bin/keylaunch &
 
-#exec  fluxbox > /var/log/fluxbox.log 2>&1
-export GNUSTEP_USER_ROOT=/usr/share/wm_data/GNUstep
-exec  wmaker
+
+wait $pid
+
+
-- 
cgit v0.12