This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] Manual merge

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 1bfa723fe2641d0834b496bc1118863e363f52d6
# Parent  61df3453426c50714b7d8c3438cc564d0fdc8863

# Parent  15a2de6f1493bd54a1468ea52cd78e979833c9f3
Manual merge

diff -r 61df3453426c -r 1bfa723fe264 freebsd-5.3-xen-sparse/fbsdxensetup
--- a/freebsd-5.3-xen-sparse/fbsdxensetup       Fri Jul  1 12:30:19 2005
+++ b/freebsd-5.3-xen-sparse/fbsdxensetup       Fri Jul  1 12:45:24 2005
@@ -1,6 +1,11 @@
 #!/bin/csh -f
-setenv XENROOT `bk root`
+setenv XENROOT `pwd`
+if ( ! -d freebsd-5.3-xen-sparse ) then
+  echo "Please run this script from the root of the Xen source tree"
+  exit 1
 rm -rf $XENROOT/fbsdtmp $XENROOT/freebsd-5.3-xenU
 mkdir -p $XENROOT/fbsdtmp
 cd $XENROOT/fbsdtmp
diff -r 61df3453426c -r 1bfa723fe264 tools/examples/bochsrc
--- /dev/null   Fri Jul  1 12:30:19 2005
+++ b/tools/examples/bochsrc    Fri Jul  1 12:45:24 2005
@@ -0,0 +1,20 @@
+#megs: 32
+#romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
+#vgaromimage: $BXSHARE/VGABIOS-lgpl-latest
+floppya: 1_44=a.img, status=inserted
+floppyb: 1_44=b.img, status=inserted
+# if you don't use absolute paths below, bochs looks under the cwd of xend, 
+# which is usually "/"
+#ata0-master: type=disk, path=/var/images/min-el3-i386.img, cylinders=800, 
heads=4, spt=32
+i440fxsupport: enabled=1
+ne2k: ioaddr=0x300, irq=9, mac=b0:c4:22:01:00:00, ethmod=linux, ethdev=eth0
+ata0-master: type=disk, path=/var/images/1g-el3-i386.img, mode=flat, 
cylinders=2048, heads=16, spt=63
+boot: c
+log: /tmp/bochsout.txt
+#debug: action=report
+info: action=report
+error: action=report
+panic: action=ask
+mouse: enabled=0

Xen-changelog mailing list

<Prev in Thread] Current Thread [Next in Thread>