summaryrefslogtreecommitdiffstats
path: root/move/tree
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-11-27 12:58:32 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-11-27 12:58:32 +0000
commitd3551589c911a40239d5be2b7ddc414f89dd548f (patch)
tree501c9d7f6a3c8a44376280563dbc1603cccb7349 /move/tree
parent9470b4477a6745cd40256a13a66e82a96eea9cdd (diff)
downloaddrakx-d3551589c911a40239d5be2b7ddc414f89dd548f.tar
drakx-d3551589c911a40239d5be2b7ddc414f89dd548f.tar.gz
drakx-d3551589c911a40239d5be2b7ddc414f89dd548f.tar.bz2
drakx-d3551589c911a40239d5be2b7ddc414f89dd548f.tar.xz
drakx-d3551589c911a40239d5be2b7ddc414f89dd548f.zip
at last a good reboot/halt from kde
Diffstat (limited to 'move/tree')
-rw-r--r--move/tree/Reboot.desktop13
-rwxr-xr-xmove/tree/X_move2
-rwxr-xr-xmove/tree/halt_reboot9
-rwxr-xr-xmove/tree/startkde_move2
4 files changed, 3 insertions, 23 deletions
diff --git a/move/tree/Reboot.desktop b/move/tree/Reboot.desktop
deleted file mode 100644
index 71449b6c2..000000000
--- a/move/tree/Reboot.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Reboot
-Exec=halt_reboot
-Terminal=false
-Icon=exit.png
-Type=Application
-Separator=true
-ForceLast=true
-
-Name[fr]=Redémarrer
-Name[it]=Riavvia
-Name[es]=Reiniciar
-Name[de]=Neustart
diff --git a/move/tree/X_move b/move/tree/X_move
index a5969ed9a..0656468ad 100755
--- a/move/tree/X_move
+++ b/move/tree/X_move
@@ -1,7 +1,7 @@
#!/bin/bash
ok=0
-while [ "$ok" == 0 -a ! -f /tmp/reboot ]; do
+while [ "$ok" == 0 -a ! -s /var/run/rebootctl ]; do
X $@
ok=$?
done
diff --git a/move/tree/halt_reboot b/move/tree/halt_reboot
index d31032fe6..b4b1d4ede 100755
--- a/move/tree/halt_reboot
+++ b/move/tree/halt_reboot
@@ -1,10 +1,5 @@
#!/bin/sh
+echo "reboot" > /var/run/rebootctl
sudo killall -USR1 startkde_move
-
-if [ $UID == 0 ]; then
- user=`getent passwd 501 | perl -ne 'print $1 if /([^:]+):/'`
- su $user -c 'dcop kdesktop default logout'
-else
- dcop kdesktop default logout
-fi \ No newline at end of file
+sudo killall X
diff --git a/move/tree/startkde_move b/move/tree/startkde_move
index 402803b5e..e8bec3da7 100755
--- a/move/tree/startkde_move
+++ b/move/tree/startkde_move
@@ -2,8 +2,6 @@
#- exit cleanly on SIGUSR1, so that our init can see a clean shutdown and automatically reboot
reboot () {
- touch /tmp/reboot
- sudo killall X
exit 0
}
trap 'reboot' SIGUSR1