diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-28 13:10:28 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-28 13:10:28 +0000 |
| commit | bcf4acfb255513919621b71c13fe43bbbed712a9 (patch) | |
| tree | 00b333a0a2314bc60c42164301c8f865e7b6d18d /stubdom/stubdom-dm | |
| parent | f5660b53ae17a97dc79b65f8e377d09f2f136f37 (diff) | |
| download | xen-bcf4acfb255513919621b71c13fe43bbbed712a9.tar.gz xen-bcf4acfb255513919621b71c13fe43bbbed712a9.tar.bz2 xen-bcf4acfb255513919621b71c13fe43bbbed712a9.zip | |
stubdom: fix mini-os messages log and SDL termination
We can now let the stubdom-dm script output mini-os messages to
stdout/err so that it gets output to the new
/var/log/xen/qemu-dm-$domname.log
In the SDL case, we must not wait for the VNC server port to appear,
as it won't ever.
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'stubdom/stubdom-dm')
| -rw-r--r-- | stubdom/stubdom-dm | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm index 0c629c6868..256501bf0b 100644 --- a/stubdom/stubdom-dm +++ b/stubdom/stubdom-dm @@ -62,32 +62,23 @@ done creation="xm create -c stubdom-$domname target=$domid memory=32" -(while true ; do sleep 60 ; done) | $creation > /var/log/xen/qemu-dm-$domid.log & +(while true ; do sleep 60 ; done) | $creation & #xterm -geometry +0+0 -e /bin/sh -c "$creation ; echo ; echo press ENTER to shut down ; read" & consolepid=$! -# Wait for vnc server to appear -while ! vnc_port=`xenstore-read /local/domain/$domid/console/vnc-port` -do - # Check that the stubdom job is still alive - kill -0 $consolepid || term - sleep 1 -done - -################ -# DEBUG: tcpdump -#while ! stubdomid=`xm domid stubdom-$domname` -#do -# sleep 1 -#done -#xterm -geometry 160x25+0+$height -e /bin/sh -c "tcpdump -n -i vif$stubdomid.0" & -#xterm -geometry 160x25+0+$((2 * $height)) -e /bin/sh -c "tcpdump -n -i vif$stubdomid.1" & - ########### # vncviewer if [ "$vncviewer" = 1 ] then + # Wait for vnc server to appear + while ! vnc_port=`xenstore-read /local/domain/$domid/console/vnc-port` + do + # Check that the stubdom job is still alive + kill -0 $consolepid || term + sleep 1 + done + vncviewer $ip:$vnc_port & vncpid=$! fi |