- wait for kpartx to finish before using partitions it created

diff --git a/ganeti-p2v-transfer.spec b/ganeti-p2v-transfer.spec
index de9988ac0591e9b74c09d4f20ce8e01c57ea91b6..d06e797cda790dffa36535aaa2e36491989dde65 100644 (file)
--- a/ganeti-p2v-transfer.spec
+++ b/ganeti-p2v-transfer.spec
@@ -7,6 +7,7 @@ Group:          Applications/System
 Source0:       https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5: c0333098304fa1868ffcaa82a942eba0
 Patch0:                DESTDIR.patch
+Patch1:                kpartx-sync.patch
 URL:           https://code.google.com/p/ganeti/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -50,6 +51,7 @@ as necessary to gain access to the bootstrap OS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}

diff --git a/kpartx-sync.patch b/kpartx-sync.patch
new file mode 100644 (file)
index 0000000..573470b
--- /dev/null
+++ b/kpartx-sync.patch
@@ -0,0 +1,11 @@
+--- ganeti-p2v-transfer-0.1/instance-p2v-target/common.sh.in~  2013-07-11 11:50:24.000000000 +0200
++++ ganeti-p2v-transfer-0.1/instance-p2v-target/common.sh.in   2014-02-06 15:51:47.751092320 +0100
+@@ -105,7 +105,7 @@
+     log_error "Cannot interpret kpartx output and get partition mapping"
+     exit 1
+   fi
+-  kpartx -a -p- $blockdev > /dev/null
++  kpartx -a -s -p- $blockdev > /dev/null
+   filesystem_dev="/dev/mapper/$filesystem_dev_base"
+   if [ ! -b "$filesystem_dev" ]; then
+     log_error "Can't find kpartx mapped partition: $filesystem_dev"