diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-27 12:58:32 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-27 12:58:32 +0000 |
| commit | d3551589c911a40239d5be2b7ddc414f89dd548f (patch) | |
| tree | 501c9d7f6a3c8a44376280563dbc1603cccb7349 /move/move.pm | |
| parent | 9470b4477a6745cd40256a13a66e82a96eea9cdd (diff) | |
| download | drakx-backup-do-not-use-d3551589c911a40239d5be2b7ddc414f89dd548f.tar drakx-backup-do-not-use-d3551589c911a40239d5be2b7ddc414f89dd548f.tar.gz drakx-backup-do-not-use-d3551589c911a40239d5be2b7ddc414f89dd548f.tar.bz2 drakx-backup-do-not-use-d3551589c911a40239d5be2b7ddc414f89dd548f.tar.xz drakx-backup-do-not-use-d3551589c911a40239d5be2b7ddc414f89dd548f.zip | |
at last a good reboot/halt from kde
Diffstat (limited to 'move/move.pm')
| -rw-r--r-- | move/move.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/move/move.pm b/move/move.pm index abdf35575..e2377fd7b 100644 --- a/move/move.pm +++ b/move/move.pm @@ -153,6 +153,8 @@ sub init { install2::handleI18NClp(); } + touch '/var/run/rebootctl'; + drakx_stuff: $o->{steps}{$_} = { reachable => 1, text => $_ } foreach qw(initGraphical autoSelectLanguage handleI18NClp verifyKey configMove startMove); @@ -289,7 +291,7 @@ sub key_installfiles { } sub reboot { - touch '/tmp/reboot'; #- tell X_move to not respawn + output('/var/run/rebootctl', "reboot"); #- tell X_move to not respawn system("killall X"); #- kill it ourselves to be sure that it won't lock console when killed by our init exit 0; } @@ -536,6 +538,8 @@ sub install2::startMove { output("/var/run/console/$username", 1); run_program::run('pam_console_apply'); + run_program::run('chown', "$username.root", '/var/run/rebootctl'); + touch '/var/run/utmp'; run_program::run('runlevel_set', '5'); member($_, qw(xfs dm devfsd syslog)) or run_program::run($_, 'start') foreach glob('/etc/rc.d/rc5.d/*'); @@ -560,6 +564,7 @@ sub install2::startMove { $ENV{LOGNAME} = $ENV{USER} = $username; $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'; } else { exec 'xwait' or c::_exit(0); |