- wait for kpartx to finish before using partitions it created

- require dpkg
- updated files

diff --git a/ganeti-instance-debootstrap.spec b/ganeti-instance-debootstrap.spec
index 0da8d179b0944a619699fbed4f6eb5cf0fb6e185..a78e49f72997d3a1da379ffa50e44ec31123f307 100644 (file)
--- a/ganeti-instance-debootstrap.spec
+++ b/ganeti-instance-debootstrap.spec
@@ -1,16 +1,18 @@
 Summary:       Debian/Ubuntu guest OS definition for Ganeti
 Name:          ganeti-instance-debootstrap
 Version:       0.14
-Release:       0.1
+Release:       0.4
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5: 318039b68d63453ac115a6987e31c6f0
+Patch0:                kpartx-sync.patch
 URL:           https://code.google.com/p/ganeti/
 BuildRequires: rpmbuild(macros) >= 1.647
 Requires:      blockdev
 Requires:      coreutils
 Requires:      debootstrap
+Requires:      dpkg
 Requires:      dump
 Requires:      e2fsprogs
 Requires:      ganeti
@@ -29,6 +31,7 @@ access).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -36,10 +39,15 @@ access).
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/ganeti/instance-debootstrap/hooks \
+       $RPM_BUILD_ROOT/var/cache/ganeti-instance-debootstrap
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/ganeti/os/debootstrap/variants.list $RPM_BUILD_ROOT%{_sysconfdir}/ganeti/instance-debootstrap
+ln -s %{_sysconfdir}/ganeti/instance-debootstrap/variants.list $RPM_BUILD_ROOT%{_datadir}/ganeti/os/debootstrap/variants.list
+
 %{__rm} -r $RPM_BUILD_ROOT/%{_docdir}/%{name}
 
 %clean
@@ -50,8 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README examples
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default/ganeti-instance-debootstrap
 %dir %{_sysconfdir}/ganeti/instance-debootstrap
+%dir %{_sysconfdir}/ganeti/instance-debootstrap/hooks
 %dir %{_sysconfdir}/ganeti/instance-debootstrap/variants
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ganeti/instance-debootstrap/variants/default.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ganeti/instance-debootstrap/variants.list
 %dir %{_datadir}/ganeti/os/debootstrap
 %{_datadir}/ganeti/os/debootstrap/common.sh
 %attr(755,root,root) %{_datadir}/ganeti/os/debootstrap/create
@@ -62,3 +72,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/ganeti/os/debootstrap/rename
 %{_datadir}/ganeti/os/debootstrap/variants.list
 %attr(755,root,root) %{_datadir}/ganeti/os/debootstrap/verify
+/var/cache/ganeti-instance-debootstrap

diff --git a/kpartx-sync.patch b/kpartx-sync.patch
new file mode 100644 (file)
index 0000000..58a840b
--- /dev/null
+++ b/kpartx-sync.patch
@@ -0,0 +1,11 @@
+--- ganeti-instance-debootstrap-0.14/common.sh.in~     2013-07-11 11:50:24.000000000 +0200
++++ ganeti-instance-debootstrap-0.14/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"