Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | ######## |
| 2 | diff --git a/glxgears_check.sh b/glxgears_check.sh |
| 3 | index 17622b8..c4d3b97 100755 |
| 4 | --- a/glxgears_check.sh |
| 5 | +++ b/glxgears_check.sh |
| 6 | @@ -31,7 +31,7 @@ else |
| 7 | |
| 8 | sleep 6 |
| 9 | |
| 10 | - XPID=$( ps ax | awk '{print $1, $5}' | grep glxgears | awk '{print $1}') |
| 11 | + XPID=$( ps | awk '{print $1, $5}' | grep glxgears | awk '{print $1}') |
| 12 | if [ ! -z "$XPID" ]; then |
| 13 | kill -9 $XPID >/dev/null 2>&1 |
| 14 | echo "glxgears can run, PASS!" |
| 15 | diff --git a/x_close.sh b/x_close.sh |
| 16 | index e287be1..3429f1a 100755 |
| 17 | --- a/x_close.sh |
| 18 | +++ b/x_close.sh |
| 19 | @@ -22,7 +22,7 @@ |
| 20 | # |
| 21 | function close_proc(){ |
| 22 | echo "kill process Xorg" |
| 23 | -XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" | awk '{print $1}') |
| 24 | +XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" | awk '{print $1}') |
| 25 | if [ ! -z "$XPID" ]; then |
| 26 | kill $XPID |
| 27 | sleep 4 |
| 28 | diff --git a/x_start.sh b/x_start.sh |
| 29 | index 9cf6eab..2305796 100755 |
| 30 | --- a/x_start.sh |
| 31 | +++ b/x_start.sh |
| 32 | @@ -24,7 +24,7 @@ |
| 33 | X_ERROR=0 |
| 34 | |
| 35 | #test whether X has started |
| 36 | -PXID=$(ps ax |awk '{print $1,$5}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}') |
| 37 | +PXID=$(ps |awk '{print $1,$6}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}') |
| 38 | if [ ! -z "$PXID" ]; then |
| 39 | echo "[WARNING] Xorg has started!" |
| 40 | XORG_STATUS="started" |
| 41 | @@ -35,9 +35,11 @@ else |
| 42 | #start up the x server |
| 43 | echo "Start up the X server for test in display $DISPLAY................" |
| 44 | |
| 45 | - $XORG_DIR/bin/X >/dev/null 2>&1 & |
| 46 | + #$XORG_DIR/bin/X >/dev/null 2>&1 & |
| 47 | + #sleep 8 |
| 48 | + #xterm & |
| 49 | + /etc/init.d/xserver-nodm start & |
| 50 | sleep 8 |
| 51 | - xterm & |
| 52 | fi |
| 53 | XLOG_FILE=/var/log/Xorg.0.log |
| 54 | [ -f $XORG_DIR/var/log/Xorg.0.log ] && XLOG_FILE=$XORG_DIR/var/log/Xorg.0.log |
| 55 | @@ -54,7 +56,7 @@ fi |
| 56 | X_ERROR=1 |
| 57 | fi |
| 58 | |
| 59 | - XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}') |
| 60 | + XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}') |
| 61 | if [ -z "$XPID" ]; then |
| 62 | echo "Start up X server FAIL!" |
| 63 | echo |
| 64 | ######## |