mcpu: Implement lock timeouts

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc41c35..51270a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -272,6 +272,7 @@ dist_TESTS = \
        test/ganeti.hooks_unittest.py \
        test/ganeti.http_unittest.py \
        test/ganeti.locking_unittest.py \
+       test/ganeti.mcpu_unittest.py \
        test/ganeti.objects_unittest.py \
        test/ganeti.rapi.resources_unittest.py \
        test/ganeti.serializer_unittest.py \
@@ -377,6 +378,7 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
          echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
          echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
+         echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
          echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
@@ -397,6 +399,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          echo 's#@BINDIR@#$(bindir)#g'; \
          echo 's#@SBINDIR@#$(sbindir)#g'; \
          echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
+         echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
          echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
          echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \