From 47b75a5820543c800961f6f133dac89878419170 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Fri, 5 Dec 2003 11:52:55 +0000
Subject: each time X respawns we need /etc/X11/Xsession rather than only
 startkde

---
 move/make_live          | 4 ----
 move/move.pm            | 2 +-
 move/tree/startkde_move | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/move/make_live b/move/make_live
index 24631d5d4..1cba4a4ba 100755
--- a/move/make_live
+++ b/move/make_live
@@ -150,10 +150,6 @@ symlinkf('/var/lib/xkb', "$::prefix/etc/X11/xkb/compiled");
 #- Xsession wants to start first-time
 unlink "$::prefix/usr/X11R6/bin/drakfw";
 
-substInFile {
-    s|startkde\b|startkde_move|;
-} "$::prefix/etc/X11/wmsession.d/01KDE";
-
 
     #- KDE
 
diff --git a/move/move.pm b/move/move.pm
index 8e131c826..cd3ef6274 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -653,7 +653,7 @@ sub install2::startMove {
         $ENV{XDM_MANAGED} = '/var/run/rebootctl,maysd,mayfn,sched';  #- for reboot/halt availability of "logout" by kde
         $ENV{GDMSESSION} = 1;  #- disable ~/.xsession-errors in Xsession (waste of usb key writes)
         chdir;
-	exec '/etc/X11/Xsession', 'KDE';  #- call it with KDE parameter to keep background
+	exec 'startkde_move';
     } else {
 	exec 'xwait', '-permanent' or c::_exit(0);
     }
diff --git a/move/tree/startkde_move b/move/tree/startkde_move
index f4bde8cba..3b1b55ab5 100755
--- a/move/tree/startkde_move
+++ b/move/tree/startkde_move
@@ -11,7 +11,7 @@ while true; do
     xwait -permanent &
     xdim=`xdpyinfo | perl -ne 'print $1 if /dimensions:\s*(\d+)/'`
     qiv --root /image/move/BOOT-$xdim-MOVE.jpg
-    startkde
+    /etc/X11/Xsession KDE   #- call it with KDE parameter to keep background image
     sudo killall X
     sleep 2
 done
-- 
cgit v1.2.1