tap-ctl-spawn: Fall back to tapdisk in $(builddir).

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/control/Makefile.am b/control/Makefile.am
index 5684e2264c15e6ba5f4b413f48d26ee844e0b4b0..e8c20c91fe30da87610cead360edb41178bbd1db 100644 (file)
--- a/control/Makefile.am
+++ b/control/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS += -DTAPCTL
 AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -DTAPDISK_EXEC='"tapdisk"'
 AM_CPPFLAGS += -DTAPDISK_EXECDIR='"$(libexecdir)"'
+AM_CPPFLAGS += -DTAPDISK_BUILDDIR='"$(top_builddir)/drivers"'
 
 sbin_PROGRAMS = tap-ctl
 tap_ctl_LDADD = libblktapctl.la

diff --git a/control/tap-ctl-spawn.c b/control/tap-ctl-spawn.c
index f3aacfb923624088e645eaea0a2a5dbe47d49fd3..728b7d8c24c2fbde2d20ea86402a1867a992b518 100644 (file)
--- a/control/tap-ctl-spawn.c
+++ b/control/tap-ctl-spawn.c
@@ -84,6 +84,10 @@ __tap_ctl_spawn(int *readfd)
        execl(TAPDISK_EXECDIR "/" TAPDISK_EXEC, TAPDISK_EXEC,
              NULL);
 
+       if (errno == ENOENT)
+               execl(TAPDISK_BUILDDIR "/" TAPDISK_EXEC, TAPDISK_EXEC,
+                     NULL);
+
        exit(errno);
 }