Mercurial > illumos > illumos-gate
changeset 11930:e86ade140716 onnv_136
6932358 installgrub needs to support extended partitions without forcing the use of the -m option
| author | Jan Setje-Eilers <Jan.Setje-Eilers@Sun.COM> |
|---|---|
| date | Mon, 15 Mar 2010 16:21:34 -0700 |
| parents | b78b6b202a5c |
| children | 9e8f8685d975 |
| files | usr/src/cmd/boot/installgrub/installgrub.c usr/src/cmd/boot/installgrub/message.h |
| diffstat | 2 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/boot/installgrub/installgrub.c Mon Mar 15 22:47:17 2010 +0000 +++ b/usr/src/cmd/boot/installgrub/installgrub.c Mon Mar 15 16:21:34 2010 -0700 @@ -360,6 +360,7 @@ if (getchar() != 'y') { write_mboot = 0; (void) fprintf(stdout, MBOOT_NOT_UPDATED); + exit(-1); } } @@ -368,8 +369,7 @@ * write GRUB to the MBR. Check for this. */ if (log_part && !write_mboot) { - (void) fprintf(stderr, EXTSOLPAR); - exit(-1); + write_mboot = 1; } /*
--- a/usr/src/cmd/boot/installgrub/message.h Mon Mar 15 22:47:17 2010 +0000 +++ b/usr/src/cmd/boot/installgrub/message.h Mon Mar 15 16:21:34 2010 -0700 @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,9 +45,6 @@ #define BOOTPAR_NOTFOUND \ gettext("Solaris boot partition not found on %s\n") -#define EXTSOLPAR \ - gettext("Solaris in extended partition. -m (MBR) option required\n") - #define NOT_RAW_DEVICE gettext("device %s is not a char special device\n") #define NOT_ROOT_SLICE gettext("raw device must be a root slice (not s2)\n")