Make kpartx wait until partitions are actually created.

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index 19eaecb752567904618f010e4785cfd72adb614e..a6d43acf1bf21fb3286684ba65c6f25d11b81573 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 2011, 2012  Lars Wirzenius
+# Copyright 2011-2013  Lars Wirzenius
 # Copyright 2012  Codethink Limited
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ import subprocess
 import tempfile
 
 
-__version__ = '0.1.0'
+__version__ = '0.2'
 
 
 class VmDebootstrap(cliapp.Application):
@@ -109,7 +109,10 @@ class VmDebootstrap(cliapp.Application):
         self.mount_points = []
 
         try:
+            rootdev = None
             roottype = 'ext4'
+            bootdev = None
+            boottype = None
             if self.settings['image']:
                 self.create_empty_image()
                 self.partition_image()
@@ -217,7 +220,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