- wait for kpartx to finish before using partitions it created

diff --git a/ganeti-instance-image.spec b/ganeti-instance-image.spec
index 8226efbabf39b603f93830c12397025855983966..81b5628f04e47a3f18ca62e7f4df3cfdc249e25e 100644 (file)
--- a/ganeti-instance-image.spec
+++ b/ganeti-instance-image.spec
@@ -6,6 +6,7 @@ License:        GPL v2
 Group:         Applications/System
 Source0:       https://code.osuosl.org/attachments/download/3285/%{name}-%{version}.tar.gz
 # Source0-md5: 6f1f50d23dd172921983c803a8286dc8
+Patch0:                kpartx-sync.patch
 URL:           https://code.osuosl.org/projects/ganeti-image
 BuildRequires: rpmbuild(macros) >= 1.647
 Requires:      ganeti
@@ -33,6 +34,7 @@ such as debootstrap.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure

diff --git a/kpartx-sync.patch b/kpartx-sync.patch
new file mode 100644 (file)
index 0000000..87425d9
--- /dev/null
+++ b/kpartx-sync.patch
@@ -0,0 +1,11 @@
+--- ganeti-instance-image-0.6/common.sh.in~    2013-07-01 21:04:13.000000000 +0200
++++ ganeti-instance-image-0.6/common.sh.in     2014-02-22 20:53:09.813718196 +0100
+@@ -288,7 +288,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/%-1/}"
+     if [ ! -b "/dev/mapper/$filesystem_dev_base" ]; then
+         log_error "Can't find kpartx mapped partition: /dev/mapper/$filesystem_dev_base"