Mercurial > illumos > illumos-gate
changeset 13742:b6bbdd77139c
2741 format shouldn't allow write SMI label to disk with EFI partition
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Steve Gonczi <gonczi@comcast.net>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Albert Lee <trisk@nexenta.com>
| author | Alexander Eremin <a.eremin@nexenta.com> |
|---|---|
| date | Thu, 14 Jun 2012 12:09:31 +0400 |
| parents | 1e57a183c0e9 |
| children | 95aba6e49b9f |
| files | usr/src/cmd/format/menu_command.c |
| diffstat | 1 files changed, 19 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/format/menu_command.c Wed Jun 27 22:10:40 2012 -0500 +++ b/usr/src/cmd/format/menu_command.c Thu Jun 14 12:09:31 2012 +0400 @@ -1563,20 +1563,24 @@ fmt_print("[1] EFI Label\n"); ioparam.io_bounds.lower = 0; ioparam.io_bounds.upper = 1; - if (cur_label == L_TYPE_SOLARIS) - deflt = 0; + if ((cur_label == L_TYPE_SOLARIS) && + (cur_disk->fdisk_part.systid != EFI_PMBR)) + deflt = L_TYPE_SOLARIS; else - deflt = 1; + deflt = L_TYPE_EFI; defltptr = &deflt; choice = input(FIO_INT, "Specify Label type", ':', &ioparam, defltptr, DATA_INPUT); - if ((choice == 0) && (cur_label == L_TYPE_SOLARIS)) { + if ((choice == L_TYPE_SOLARIS) && + (cur_label == L_TYPE_SOLARIS) && + (cur_disk->fdisk_part.systid != EFI_PMBR)) { goto expert_end; - } else if ((choice == 1) && (cur_label == L_TYPE_EFI)) { + } else if ((choice == L_TYPE_EFI) && + (cur_label == L_TYPE_EFI)) { goto expert_end; } switch (choice) { - case 0: + case L_TYPE_SOLARIS: /* * EFI label to SMI label */ @@ -1648,17 +1652,19 @@ } - case 1: + case L_TYPE_EFI: /* * SMI label to EFI label */ - - fmt_print("Warning: This disk has an SMI label. Changing to " - "EFI label will erase all\ncurrent partitions.\n"); - - if (check("Continue")) { - return (-1); + if ((cur_disk->fdisk_part.systid == SUNIXOS) || + (cur_disk->fdisk_part.systid == SUNIXOS2)) { + fmt_print("Warning: This disk has an SMI label. " + "Changing to EFI label will erase all\ncurrent " + "partitions.\n"); + if (check("Continue")) { + return (-1); + } } if (get_disk_info(cur_file, &efinfo) != 0) {