diff options
| author | bo zhou - Sun Microsystems - Beijing China <Bo.Zhou@Sun.COM> | 2008-10-23 11:19:28 +0800 |
|---|---|---|
| committer | bo zhou - Sun Microsystems - Beijing China <Bo.Zhou@Sun.COM> | 2008-10-23 11:19:28 +0800 |
| commit | 9daef70d225b6364f70a31bb53a4d55b46150690 (patch) | |
| tree | 1300d50485d68151311962a004a34d62bf8883e7 /usr/src/cmd/format | |
| parent | 1fad2c0e393159d2f49000984db0f9b41536d271 (diff) | |
| download | illumos-joyent-9daef70d225b6364f70a31bb53a4d55b46150690.tar.gz | |
6756639 Format should not print "No fdisk solaris partition found" on sparc machine
Diffstat (limited to 'usr/src/cmd/format')
| -rw-r--r-- | usr/src/cmd/format/menu_command.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/usr/src/cmd/format/menu_command.c b/usr/src/cmd/format/menu_command.c index da496e3448..c5b5ea930e 100644 --- a/usr/src/cmd/format/menu_command.c +++ b/usr/src/cmd/format/menu_command.c @@ -303,11 +303,6 @@ found: if (nhead != 0 && nsect != 0) (void) copy_solaris_part(&cur_disk->fdisk_part); - if (cur_disk->fdisk_part.numsect == 0) { - err_print("\nNo fdisk solaris partition found.\n"); - goto exit; - } - if ((cur_disk->label_type == L_TYPE_EFI) && (cur_disk->disk_parts->etoc->efi_flags & EFI_GPT_PRIMARY_CORRUPT)) { @@ -316,6 +311,17 @@ found: err_print("Use the 'backup' command to restore "); err_print("the primary label.\n"); } + +#if defined(_SUNOS_VTOC_16) + /* + * If there is no fdisk solaris partition. + */ + if (cur_disk->fdisk_part.numsect == 0) { + err_print("No Solaris fdisk partition found.\n"); + goto exit; + } +#endif /* defined(_SUNOS_VTOC_16) */ + /* * If the label of the disk is marked dirty, * see if they'd like to label the disk now. |