summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-05 11:52:55 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-05 11:52:55 +0000
commit47b75a5820543c800961f6f133dac89878419170 (patch)
tree7ed73c6fe77da9423b0196f54183ebff6f9d2644
parent2e5b217dd1b56e15564f4435732c59acafdb0643 (diff)
downloaddrakx-backup-do-not-use-47b75a5820543c800961f6f133dac89878419170.tar
drakx-backup-do-not-use-47b75a5820543c800961f6f133dac89878419170.tar.gz
drakx-backup-do-not-use-47b75a5820543c800961f6f133dac89878419170.tar.bz2
drakx-backup-do-not-use-47b75a5820543c800961f6f133dac89878419170.tar.xz
drakx-backup-do-not-use-47b75a5820543c800961f6f133dac89878419170.zip
each time X respawns we need /etc/X11/Xsession rather than only startkde
-rwxr-xr-xmove/make_live4
-rw-r--r--move/move.pm2
-rwxr-xr-xmove/tree/startkde_move2
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