diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-08-06 09:34:55 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-08-06 09:34:55 +0100 |
commit | 66e56e754b601d56be639370fdfcae3231a35b2c (patch) | |
tree | acea75307ccab8c411a8357dad886246a13444f0 /tools | |
parent | 1d0103c4da578fba9dee662b1e72ba69a58c22e0 (diff) | |
download | xen-66e56e754b601d56be639370fdfcae3231a35b2c.tar.gz xen-66e56e754b601d56be639370fdfcae3231a35b2c.tar.bz2 xen-66e56e754b601d56be639370fdfcae3231a35b2c.zip |
install more documentation to /usr/share/doc/xen and /etc/xen
Also resync xmexample3 with xmexample1 and 2.
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/blktap/Makefile | 3 | ||||
-rw-r--r-- | tools/examples/Makefile | 18 | ||||
-rw-r--r-- | tools/examples/README | 4 | ||||
-rw-r--r-- | tools/examples/xmexample3 | 22 | ||||
-rw-r--r-- | tools/xenmon/Makefile | 2 |
5 files changed, 48 insertions, 1 deletions
diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 871e2c4b60..21c9556f60 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -8,3 +8,6 @@ SUBDIRS-y += drivers .PHONY: all clean install all clean install: %: subdirs-% +install: + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) + $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.blktap diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 8f967084a5..39310394f5 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -8,11 +8,18 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains # Xen configuration dir and configs to go there. XEN_CONFIG_DIR = /etc/xen +XEN_READMES = README +XEN_READMES += README.incompatibilities XEN_CONFIGS = xend-config.sxp XEN_CONFIGS += xm-config.xml XEN_CONFIGS += xmexample1 XEN_CONFIGS += xmexample2 +XEN_CONFIGS += xmexample3 XEN_CONFIGS += xmexample.hvm +XEN_CONFIGS += xmexample.hvm-stubdom +XEN_CONFIGS += xmexample.hvm-dm +XEN_CONFIGS += xmexample.pv-grub +XEN_CONFIGS += xmexample.nbd XEN_CONFIGS += xmexample.vti XEN_CONFIGS += xend-pci-quirks.sxp XEN_CONFIGS += xend-pci-permissive.sxp @@ -59,7 +66,16 @@ all: build: .PHONY: install -install: all install-initd install-configs install-scripts $(HOTPLUGS) +install: all install-readmes install-initd install-configs install-scripts $(HOTPLUGS) + +.PHONY: install-readmes +install-readmes: + [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) + set -e; for i in $(XEN_READMES); \ + do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \ + $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \ + done .PHONY: install-initd install-initd: diff --git a/tools/examples/README b/tools/examples/README index 00ef8dc352..e2e8f434df 100644 --- a/tools/examples/README +++ b/tools/examples/README @@ -44,4 +44,8 @@ xmexample3 - an advanced configuration script for 'xm create' xmexample.nbd - configuration script that uses NBD filesystems xmexample.hvm - a configuration script for creating a hvm domain with 'xm create' +xmexample.hvm-stubdom - a configuration script for creating a hvm domain with + 'xm create' that utilizes a stubdomain for device model +xmexample.pv-grub - a configuration script for creating a domain with 'xm create' + which boots PV-GRUB. xmexample.vti - a configuration script for creating a domain on vti diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 index 8610fcc483..99281904fd 100644 --- a/tools/examples/xmexample3 +++ b/tools/examples/xmexample3 @@ -207,4 +207,26 @@ extra = "4 VMID=%d" % vmid #on_reboot = 'restart' #on_crash = 'restart' +#----------------------------------------------------------------------------- +# Configure PVSCSI devices: +# +#vscsi=[ 'PDEV, VDEV' ] +# +# PDEV gives physical SCSI device to be attached to specified guest +# domain by one of the following identifier format. +# - XX:XX:XX:XX (4-tuples with decimal notation which shows +# "host:channel:target:lun") +# - /dev/sdxx or sdx +# - /dev/stxx or stx +# - /dev/sgxx or sgx +# - result of 'scsi_id -gu -s'. +# ex. # scsi_id -gu -s /block/sdb +# 36000b5d0006a0000006a0257004c0000 +# +# VDEV gives virtual SCSI device by 4-tuples (XX:XX:XX:XX) as +# which the specified guest domain recognize. +# + +#vscsi = [ '/dev/sdx, 0:0:0:0' ] + #============================================================================ diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 1a53d65d22..0b35f451d0 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -33,6 +33,8 @@ install: build $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) + $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon .PHONY: clean clean: |