From 35d587b57b457e912bbc0e2a08e43c9ee5dcc0a5 Mon Sep 17 00:00:00 2001
From: Owen Synge <osynge@suse.com>
Date: Thu, 7 Aug 2014 11:23:09 +0200
Subject: [PATCH] Fix "disk zap" sgdisk invocation

If the metadata on the disk is truly invalid, sgdisk would fail to zero
it in one go, because --mbrtogpt apparently tried to operate on the
metadata it read before executing --zap-all.

Splitting this up into two separate invocations to first zap everything
and then clear it properly fixes this issue.

Based on patch by Lars Marowsky-Bree <lmb@suse.com> in ceph-deploy.
Created by Vincent Untz <vuntz@suse.com>

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 328cd17546187fb3e17766a1148012c43e25e205)
(cherry picked from commit d54a8b1f5b8ffbd948503cfbf27e7c3f55b5c542)
---
 src/ceph-disk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ceph-disk b/src/ceph-disk
index c3c6951442093..b6d1418b3ce91 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1063,6 +1063,13 @@ def zap(dev):
             [
                 'sgdisk',
                 '--zap-all',
+                '--',
+                dev,
+            ],
+        )
+        command_check_call(
+            [
+                'sgdisk',
                 '--clear',
                 '--mbrtogpt',
                 '--',
-- 
2.39.5