Apply patch from Neil Williams to fix kpartx timing problem

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index 705cdfa407503abeb8c8f1878986b59f9e7cca2b..a8126fd99f881bc0a833eaa9542a0e91af886649 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -23,9 +23,10 @@ import re
 import shutil
 import subprocess
 import tempfile
+import time
 
 
-__version__ = '0.1.0'
+__version__ = '0.2'
 
 
 class VmDebootstrap(cliapp.Application):
@@ -220,7 +221,7 @@ class VmDebootstrap(cliapp.Application):
         self.runcmd(['install-mbr', self.settings['image']])
 
     def setup_kpartx(self):
-        out = self.runcmd(['kpartx', '-av', self.settings['image']])
+        out = self.runcmd(['kpartx', '-avs', self.settings['image']])
         if self.settings['bootsize']:
             bootindex = 0
             rootindex = 1
@@ -469,10 +470,15 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s
         if self.settings['image']:
             for i in xrange(len(self.mount_points) - 1, -1, -1):
                 mount_point = self.mount_points[i]
-                self.runcmd(['umount', mount_point], ignore_fail=True)
+                try:
+                    self.runcmd(['umount', mount_point], ignore_fail=False)
+                except cliapp.AppException:
+                    logging.debug("umount failed, sleeping and trying again")
+                    time.sleep(5)
+                    self.runcmd(['umount', mount_point], ignore_fail=False)
 
             self.runcmd(['kpartx', '-d', self.settings['image']], ignore_fail=True)
-        
+
         for dirname in self.remove_dirs:
             shutil.rmtree(dirname)