From: Karel Zak <kzak@redhat.com>
Date: Thu, 4 Oct 2018 12:06:45 +0000 (+0200)
Subject: sfdisk: disable --activate for Hybrid GPT/MBR
X-Git-Tag: v2.33-rc2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a77bd80d5;p=thirdparty%2Futil-linux.git

sfdisk: disable --activate for Hybrid GPT/MBR

Addresses: https://github.com/karelzak/util-linux/issues/699
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 21fcfa6864..3911dda850 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -824,6 +824,9 @@ static int command_activate(struct sfdisk *sf, int argc, char **argv)
 		err(EXIT_FAILURE, _("cannot open %s"), devname);
 
 	if (fdisk_is_label(sf->cxt, GPT)) {
+		if (fdisk_gpt_is_hybrid(sf->cxt))
+			errx(EXIT_FAILURE, _("toggle boot flags is unsupported for Hybrid GPT/MBR"));
+
 		/* Switch from GPT to PMBR */
 		sf->cxt = fdisk_new_nested_context(sf->cxt, "dos");
 		if (!sf->cxt)