almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

imgutils: use -s for kpartx, wait for device creation

Browse Source 
kpartx can return before the devices are created. Use -s to wait.
Also remove -p p and let kpartx handle adding pX if needed, we use
whatever it outputs so there is no need to force a name.
This commit is contained in:
Brian C. Lane 2012-12-14 10:34:53 -08:00
parent 07c99ae8d0
commit 665ee8be7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pylorax/imgutils.py
View File

@ -253,7 +253,7 @@ class PartitionMount(object):
# kpartx -p p -v -a /tmp/diskV2DiCW.im # kpartx -p p -v -a /tmp/diskV2DiCW.im
# add map loop2p1 (253:2): 0 3481600 linear /dev/loop2 2048 # add map loop2p1 (253:2): 0 3481600 linear /dev/loop2 2048
# add map loop2p2 (253:3): 0 614400 linear /dev/loop2 3483648 # add map loop2p2 (253:3): 0 614400 linear /dev/loop2 3483648
kpartx_output = runcmd_output(["kpartx", "-v", "-p", "p", "-a", self.disk_img]) kpartx_output = runcmd_output(["kpartx", "-v", "-a", "-s", self.disk_img])
logger.debug(kpartx_output) logger.debug(kpartx_output)
# list of (deviceName, sizeInBytes) # list of (deviceName, sizeInBytes)
@ -291,7 +291,7 @@ class PartitionMount(object):
umount( self.mount_dir ) umount( self.mount_dir )
os.rmdir(self.mount_dir) os.rmdir(self.mount_dir)
self.mount_dir = None self.mount_dir = None
execWithRedirect("kpartx", ["-d", self.disk_img]) execWithRedirect("kpartx", ["-d", "-s", self.disk_img])
######## Functions for making filesystem images ########################## ######## Functions for making filesystem images ##########################