aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@striker.cl.cam.ac.uk <iap10@striker.cl.cam.ac.uk>2003-10-01 15:54:32 +0000
committeriap10@striker.cl.cam.ac.uk <iap10@striker.cl.cam.ac.uk>2003-10-01 15:54:32 +0000
commit507e2b770da59d177a72eebe7b30b01a07fb1ff4 (patch)
treec6f5ef0d7fd7ff51b43abcc35b22a7e53e724840
parentb1deb326aae98cab8637b88f92524397d3b9d84f (diff)
parentcf6f12bfcf015098191a3e7f9dcded3953e35115 (diff)
downloadxen-507e2b770da59d177a72eebe7b30b01a07fb1ff4.tar.gz
xen-507e2b770da59d177a72eebe7b30b01a07fb1ff4.tar.bz2
xen-507e2b770da59d177a72eebe7b30b01a07fb1ff4.zip
bitkeeper revision 1.477 (3f7af8b82LonZol-iaBebE9SLaDifw)
Merge striker.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno-1.0.bk into striker.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno.bk
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--README.CD2
-rw-r--r--tools/control/Makefile2
3 files changed, 4 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index cfbe120742..b66e37b978 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -8,6 +8,7 @@ bd240@boulderdash.cl.cam.ac.uk
bd240@labyrinth.cl.cam.ac.uk
iap10@freefall.cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk
+iap10@striker.cl.cam.ac.uk
jws22@gauntlet.cl.cam.ac.uk
jws@cairnwell.research
kaf24@labyrinth.cl.cam.ac.uk
diff --git a/README.CD b/README.CD
index f256d2184a..919f3a44f0 100644
--- a/README.CD
+++ b/README.CD
@@ -227,6 +227,8 @@ of the following possibilities, for example:
* root=/dev/hda3 ro
boot using a standard hard disk partition as root
+ !!! remember to do "xenctl physical grant -phda3 -w -n<dom>" first
+ (grant domain <dom> read/write access to partition 3)
* root=/dev/xvda1 ro
boot using a pre-configured 'virtual block device' that will be
diff --git a/tools/control/Makefile b/tools/control/Makefile
index 7a49e1807a..ce594d833b 100644
--- a/tools/control/Makefile
+++ b/tools/control/Makefile
@@ -8,7 +8,7 @@ clean: clean-cmdline clean-web
examples: FORCE
mkdir -p ../../../install/etc
- chmod +w ../../../install/etc/*
+ chmod +w ../../../install/etc/* || true
cp examples/xen* examples/*example ../../../install/etc/
cmdline: FORCE