summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-02 23:17:42 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-02 23:17:42 +0000
commitd227289359e13260b7e55bda15e90c3a11acc736 (patch)
tree78a787cd634ba3d3ccff9bc0def322ad3a0b92ae
parent155f09dfc1a0551da46d70fbec4f5134ac5e4dae (diff)
downloaddrakx-d227289359e13260b7e55bda15e90c3a11acc736.tar
drakx-d227289359e13260b7e55bda15e90c3a11acc736.tar.gz
drakx-d227289359e13260b7e55bda15e90c3a11acc736.tar.bz2
drakx-d227289359e13260b7e55bda15e90c3a11acc736.tar.xz
drakx-d227289359e13260b7e55bda15e90c3a11acc736.zip
should at least disable X respawning too fast now
-rwxr-xr-xmove/tree/X_move9
1 files changed, 3 insertions, 6 deletions
diff --git a/move/tree/X_move b/move/tree/X_move
index 8059cbcba..dde4bcc32 100755
--- a/move/tree/X_move
+++ b/move/tree/X_move
@@ -1,18 +1,15 @@
#!/bin/bash
ok=0
-lastdate2=0
lastdate1=0
lastdate0=0
while [ "$ok" == 0 -a ! -s /var/run/rebootctl ]; do
- lastdate3=$lastdate2
lastdate2=$lastdate1
lastdate1=$lastdate0
lastdate0=`date +%s`
- if [ `expr $lastdate0 - $lastdate3` -lt 20 ]; then
- echo "X server respawning too fast [ $lastdate0 : $lastdate1 : $lastdate2 : $lastdate3 ] :("
- while [ true ]; do sleep 10; done
- exit 1
+ if [ `expr $lastdate0 - $lastdate2` -lt 40 ]; then
+ echo "X server respawning too fast :(, dropping to a shell"
+ bash
fi
X $@
ok=$?