Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
kpartx synchronouly unmaps partitions
  • Loading branch information
oppegard authored and Gary Liu committed Apr 4, 2013
1 parent c5c435d commit 7ef64ff
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions stemcell_builder/stages/image_aws_update_grub/apply.sh
Expand Up @@ -10,7 +10,7 @@ source $base_dir/lib/prelude_apply.bash
disk_image_name=root.img

# unmap the loop device in case it's already mapped
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name

# Map partition in image to loopback
dev=$(kpartx -avs $work/$disk_image_name | grep "^add" | cut -d" " -f3)
Expand All @@ -31,4 +31,4 @@ rm -f $mnt/boot/grub/menu.lst~
umount $mnt

# Unmap partition
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name
4 changes: 2 additions & 2 deletions stemcell_builder/stages/image_create/apply.sh
Expand Up @@ -20,7 +20,7 @@ parted --script $work/$disk_image_name mklabel msdos
parted --script $work/$disk_image_name mkpart primary ext2 $part_offset $part_size

# unmap the loop device in case it's already mapped
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name

# Map partition in image to loopback
dev=$(kpartx -avs $work/$disk_image_name | grep "^add" | cut -d" " -f3)
Expand Down Expand Up @@ -53,4 +53,4 @@ fi

# Unmap partition
echo "Removing device mappings for $disk_image_name"
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name
4 changes: 2 additions & 2 deletions stemcell_builder/stages/image_install_grub/apply.sh
Expand Up @@ -10,7 +10,7 @@ source $base_dir/lib/prelude_apply.bash
disk_image_name=root.img

# unmap the loop device in case it's already mapped
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name

# Map partition in image to loopback
dev=$(kpartx -avs $work/$disk_image_name | grep "^add" | cut -d" " -f3)
Expand Down Expand Up @@ -65,4 +65,4 @@ rm -rf $mnt/tmp/grub
umount $mnt

# Unmap partition
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name
4 changes: 2 additions & 2 deletions stemcell_builder/stages/image_openstack_update_grub/apply.sh
Expand Up @@ -10,7 +10,7 @@ source $base_dir/lib/prelude_apply.bash
disk_image_name=root.img

# unmap the loop device in case it's already mapped
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name

# Map partition in image to loopback
dev=$(kpartx -avs $work/$disk_image_name | grep "^add" | cut -d" " -f3)
Expand All @@ -31,4 +31,4 @@ rm -f $mnt/boot/grub/menu.lst~
umount $mnt

# Unmap partition
kpartx -dv $work/$disk_image_name
kpartx -dvs $work/$disk_image_name

0 comments on commit 7ef64ff

Please sign in to comment.