diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-12-01 15:40:29 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-12-01 15:40:29 +0000 |
| commit | af5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f (patch) | |
| tree | a9347394c3d2ffea5cede55cbcc88acff1d9ca47 /move | |
| parent | bf6976b19dd3ce6b66823f5fa4cb8101aa898cf8 (diff) | |
| download | drakx-backup-do-not-use-af5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f.tar drakx-backup-do-not-use-af5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f.tar.gz drakx-backup-do-not-use-af5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f.tar.bz2 drakx-backup-do-not-use-af5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f.tar.xz drakx-backup-do-not-use-af5a0f5b9eefe8a5a8ff4697d82ec0613cdd1e6f.zip | |
start with Xsession so that we run /etc/X11/xinit.d scripts (mountloop in particular)
Diffstat (limited to 'move')
| -rwxr-xr-x | move/make_live | 4 | ||||
| -rw-r--r-- | move/move.pm | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/move/make_live b/move/make_live index cb345525d..6a130c3a4 100755 --- a/move/make_live +++ b/move/make_live @@ -161,3 +161,7 @@ substInFile { #- Xsession wants to start first-time unlink "$::prefix/usr/X11R6/bin/drakfw"; + +substInFile { + s|startkde|startkde_move|; +} "$::prefix/etc/X11/wmsession.d/01KDE"; diff --git a/move/move.pm b/move/move.pm index 67f65be88..f065e3086 100644 --- a/move/move.pm +++ b/move/move.pm @@ -604,7 +604,8 @@ sub install2::startMove { $ENV{HOME} = $home; $ENV{SHELL} = $shell; $ENV{XDM_MANAGED} = '/var/run/rebootctl,maysd,mayfn,sched'; #- for reboot/halt availability of "logout" by kde - exec 'startkde_move'; + $ENV{GDMSESSION} = 1; #- disable ~/.xsession-errors in Xsession (waste of usb key writes) + exec '/etc/X11/Xsession', 'KDE'; #- call it with KDE parameter to keep background } else { exec 'xwait' or c::_exit(0); } |