diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2009-06-18 10:29:58 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2009-06-18 10:29:58 +0100 |
commit | 590b3ce1d371e5d53fadb28ee965cdb2a4765c73 (patch) | |
tree | 7149956d823303936ab58d356e14cf45ec4731cf /tools/blktap2/Makefile | |
parent | 6c11039cbd07fb537b33dbf57d579ce57be1ab88 (diff) | |
download | xen-590b3ce1d371e5d53fadb28ee965cdb2a4765c73.tar.gz xen-590b3ce1d371e5d53fadb28ee965cdb2a4765c73.tar.bz2 xen-590b3ce1d371e5d53fadb28ee965cdb2a4765c73.zip |
blktap: re-enable blktap1 if blktap2 is disabled
This patch re-enables a useful blktap1 for users who disable blktap2.
Itremoves tapdisk and blktapctrl from blktap2, both of which cause
problems with blktap operation. In addition, this patch modifies xend
to check for blktap2 installation. If the blktap2 driver isn't
running (hopefully because the dom0 kernel option wasn't selected) we
fall back to blktap.
Signed-off-by: Dutch Meyer <dmeyer@cs.ubc.ca>
Diffstat (limited to 'tools/blktap2/Makefile')
-rw-r--r-- | tools/blktap2/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile index 64983a01e6..2558aa15ae 100644 --- a/tools/blktap2/Makefile +++ b/tools/blktap2/Makefile @@ -9,7 +9,6 @@ SUBDIRS-y += include SUBDIRS-y += lvm SUBDIRS-y += vhd SUBDIRS-y += drivers -SUBDIRS-y += daemon clean: rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS |