summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-12 14:14:59 +0000
committerGerrit Code Review <review@openstack.org>2018-06-12 14:14:59 +0000
commit0e64316282c6a55c7924028d2fc9ca1ad943a206 (patch)
treedd1a14fc0ee2e9924794017c548827b42daa3372
parentfdfb1a4f0a281eab41676c8689663b5c56abc910 (diff)
parent25cfa3a80a0a6204cc0c98996926cae972a10057 (diff)
downloadironic-python-agent-0e64316282c6a55c7924028d2fc9ca1ad943a206.tar.gz
Merge "Fix for fatal error when GPT was used and only MBR was cleaned" into stable/ocata
-rwxr-xr-xironic_python_agent/shell/write_image.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic_python_agent/shell/write_image.sh b/ironic_python_agent/shell/write_image.sh
index c8cd3880..165d7176 100755
--- a/ironic_python_agent/shell/write_image.sh
+++ b/ironic_python_agent/shell/write_image.sh
@@ -36,7 +36,7 @@ DEVICE="$2"
# In production this will be replaced with secure erasing the drives
# For now we need to ensure there aren't any old (GPT) partitions on the drive
log "Erasing existing GPT and MBR data structures from ${DEVICE}"
-sgdisk -Z $DEVICE
+sgdisk -Z $DEVICE || sgdisk -o $DEVICE
log "Imaging $IMAGEFILE to $DEVICE"