Use bash in entrance_session to get around "entrance quitting right after login" bug

Alter entrance_wrapper to call Xinit scripts (forcefully disable 99gpe-login for now)
Add a Failsafe Session file
Rename Session back to Sessions (config db has been updated accordingly)
Change config db to have all 7 entries filled out (most with Enlightenment) to stop crashes

7 files changed, 64 insertions, 33 deletions

diff --git a/packages/e17/entrance/Session/.mtn2git_empty b/packages/e17/entrance/Sessions/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/e17/entrance/Session/.mtn2git_empty
+++ b/packages/e17/entrance/Sessions/.mtn2git_empty
diff --git a/packages/e17/entrance/Session/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment
index 4d33bbb2e9..4d33bbb2e9 100644
--- a/packages/e17/entrance/Session/Enlightenment
+++ b/packages/e17/entrance/Sessions/Enlightenment
diff --git a/packages/e17/entrance/Sessions/Failsafe b/packages/e17/entrance/Sessions/Failsafe
new file mode 100644
index 0000000000..cf4fcced12
--- /dev/null
+++ b/packages/e17/entrance/Sessions/Failsafe
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rxvt
\ No newline at end of file
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index 33da62435f..874231b95b 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,5 +1,5 @@
---- entrance/data/config/build_config.sh.in.orig	2005-08-14 18:19:30.912299673 +0200
-+++ entrance/data/config/build_config.sh.in	2005-08-14 18:21:36.309692562 +0200
+--- entrance/data/config/build_config.sh.in~	2005-08-15 23:24:39.000000000 -0700
++++ entrance/data/config/build_config.sh.in	2005-08-15 23:25:15.000000000 -0700
 @@ -3,7 +3,7 @@
  rm -f $DB
  
@@ -9,13 +9,15 @@
  
  # uncomment the below to enable experimental OpenGL hardware acceleration
  #edb_ed $DB add /entrance/engine int 1
-@@ -19,31 +19,31 @@
+@@ -18,30 +18,30 @@
+ #edb_ed $DB add /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
  #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
  edb_ed $DB add /entrance/greeting/before str "Welcome to "
- edb_ed $DB add /entrance/greeting/after str ""
--edb_ed $DB add /entrance/session/count int 8
-+edb_ed $DB add /entrance/session/count int 4
- edb_ed $DB add /entrance/session/0/session str "default"
+-edb_ed $DB add /entrance/greeting/after str ""
++edb_ed $DB add /entrance/greeting/after str " e17/OE"
+ edb_ed $DB add /entrance/session/count int 8
+-edb_ed $DB add /entrance/session/0/session str "default"
++edb_ed $DB add /entrance/session/0/session str "/etc/X11/Sessions/Default"
  edb_ed $DB add /entrance/session/0/title str "Default"
  edb_ed $DB add /entrance/session/0/icon str "default.png"
  edb_ed $DB add /entrance/session/1/icon str "enlightenment.png"
@@ -37,27 +39,23 @@
 -edb_ed $DB add /entrance/session/6/title str "XFce"
 -edb_ed $DB add /entrance/session/6/icon str "xfce.png"
 -edb_ed $DB add /entrance/session/7/session str "failsafe"
--edb_ed $DB add /entrance/session/7/title str "Failsafe"
--edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
-+edb_ed $DB add /entrance/session/1/session str "/etc/X11/Session/Enlightenment"
-+#edb_ed $DB add /entrance/session/2/session str "kde"
-+#edb_ed $DB add /entrance/session/2/title str "KDE"
-+#edb_ed $DB add /entrance/session/2/icon str "kde.png"
-+edb_ed $DB add /entrance/session/2/session str "/etc/X11/Session/GPE"
-+edb_ed $DB add /entrance/session/2/title str "GPE"
-+edb_ed $DB add /entrance/session/2/icon str "gnome.png"
-+#edb_ed $DB add /entrance/session/4/session str "blackbox"
-+#edb_ed $DB add /entrance/session/4/title str "Blackbox"
-+#edb_ed $DB add /entrance/session/4/icon str "blackbox.png"
-+#edb_ed $DB add /entrance/session/5/session str "sawfish"
-+#edb_ed $DB add /entrance/session/5/title str "Sawfish"
-+#edb_ed $DB add /entrance/session/5/icon str "default.png"
-+#edb_ed $DB add /entrance/session/6/session str "xfce"
-+#edb_ed $DB add /entrance/session/6/title str "XFce"
-+#edb_ed $DB add /entrance/session/6/icon str "xfce.png"
-+edb_ed $DB add /entrance/session/3/session str "/etc/X11/Session/Failsafe"
-+edb_ed $DB add /entrance/session/3/title str "Failsafe"
-+edb_ed $DB add /entrance/session/3/icon str "failsafe.png"
++edb_ed $DB add /entrance/session/2/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/2/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/2/title str "Enlightenment"
++edb_ed $DB add /entrance/session/3/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/3/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/3/title str "Enlightenment"
++edb_ed $DB add /entrance/session/4/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/4/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/4/title str "Enlightenment"
++edb_ed $DB add /entrance/session/5/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/5/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/5/title str "Enlightenment"
++edb_ed $DB add /entrance/session/6/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/6/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/6/title str "Enlightenment"
++edb_ed $DB add /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/7/session str "/etc/X11/Sessions/Failsafe"
+ edb_ed $DB add /entrance/session/7/title str "Failsafe"
+ edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
  edb_ed $DB add /entrance/system/reboot int 1
- edb_ed $DB add /entrance/system/halt int 1
- edb_ed $DB add /entrance/user/remember int 1
diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch
new file mode 100644
index 0000000000..1d6c2307f7
--- /dev/null
+++ b/packages/e17/entrance/run-Xinit.patch
@@ -0,0 +1,17 @@
+--- entrance/src/daemon/entrance_wrapper.in.~1.1.~	2003-01-31 13:57:06.000000000 -0800
++++ entrance/src/daemon/entrance_wrapper.in	2005-08-15 20:13:57.000000000 -0700
+@@ -5,8 +5,13 @@
+ 
+ test -f /etc/profile && . /etc/profile
+ 
++if [ -x /etc/X11/Xinit.d/99gpe-login ]; then
++		chmod -x /etc/X11/Xinit.d/99gpe-login
++fi
++
++/etc/X11/Xinit
++
+ exec @prefix@/bin/entrance "$@"
+ 
+ #fallback
+ exec entrance "$@"
+-
diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch
new file mode 100644
index 0000000000..4d3b2f4aae
--- /dev/null
+++ b/packages/e17/entrance/use-bash.patch
@@ -0,0 +1,11 @@
+--- entrance/src/client/entrance_session.c.~1.71.~	2005-05-28 02:31:14.000000000 -0700
++++ entrance/src/client/entrance_session.c	2005-08-15 21:45:53.000000000 -0700
+@@ -451,7 +451,7 @@
+                     (int) pid);
+         }
+         _entrance_session_user_list_fix(e);
+-        shell = strdup("/bin/sh");
++        shell = strdup("/bin/bash");
+         /* this bypasses a race condition where entrance loses its x
+            connection before the wm gets it and x goes and resets itself */
+         sleep(10);
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 2673ec27f0..af11e07fd5 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -13,8 +13,10 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/
            file://Xserver.patch;patch=1 \
            file://config-db.patch;patch=1 \
            file://allow-missing-xsession.patch;patch=1 \
+           file://run-Xinit.patch;patch=1 \
+           file://use-bash.patch;patch=1 \
 	   file://Xinit.d \
-	   file://Session"
+	   file://Sessions"
 	   
 S = "${WORKDIR}/entrance"
 
@@ -28,9 +30,9 @@ FILES += "${datadir}"
 do_install_append() {
 	install -d ${D}/etc/X11/Xinit.d
 	install -d ${D}/etc/X11/Xsession.d
-	install -d ${D}/etc/X11/Session
+	install -d ${D}/etc/X11/Sessions
 	
 	install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d
-	install -m 755 ${WORKDIR}/Session/* ${D}/etc/X11/Session
+	install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
 	
 }