Switching to Xorg

This commit is contained in:
Jay McCarthy 2010-11-10 08:58:29 -07:00
parent 86d7fd5d0c
commit 16e4d17975
3 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@
(plt-directory "/opt/plt")
(drdr-directory "/opt/svn/drdr")
(git-path "/usr/bin/git")
(Xvfb-path "/usr/bin/Xvfb")
(Xvfb-path "/usr/bin/Xorg")
(fluxbox-path "/usr/bin/fluxbox")
(current-make-install-timeout-seconds (* 90 60))
(current-make-timeout-seconds (* 90 60))

View File

@ -9,7 +9,7 @@ cd "$DRDR"
kill_all() {
cat "$LOGS/"*.pid > /tmp/leave-pids-$$
KILL=`pgrep '^(Xvfb|fluxbox|racket|gracket(-text)?)$' | grep -w -v -f /tmp/leave-pids-$$`
KILL=`pgrep '^(Xorg|Xvfb|Xvnc|fluxbox|racket|gracket(-text)?)$' | grep -w -v -f /tmp/leave-pids-$$`
rm /tmp/leave-pids-$$
kill -15 $KILL
sleep 2

View File

@ -304,7 +304,7 @@
(safely-delete-directory (format "/tmp/.tX~a-lock" i))
(safely-delete-directory (build-path tmp-dir (format ".tX~a-lock" i)))
(with-running-program
(Xvfb-path) (list (format ":~a" i) "-screen" "0" "800x600x24" "-ac" "-br" "-bs" "-kb" "+extension" "RANDR")
(Xvfb-path) (list (format ":~a" i) "-ac" "-br" "-bs" "+extension" "RANDR")
(lambda ()
(with-running-program
(fluxbox-path) (list "-display" (format ":~a" i) "-rc" "/home/jay/.fluxbox/init")