summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/cmd/boot/installgrub/installgrub.c4
-rw-r--r--usr/src/cmd/boot/installgrub/message.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/boot/installgrub/installgrub.c b/usr/src/cmd/boot/installgrub/installgrub.c
index c5bcbeb6ca..f1beaa473b 100644
--- a/usr/src/cmd/boot/installgrub/installgrub.c
+++ b/usr/src/cmd/boot/installgrub/installgrub.c
@@ -360,6 +360,7 @@ found_part:
if (getchar() != 'y') {
write_mboot = 0;
(void) fprintf(stdout, MBOOT_NOT_UPDATED);
+ exit(-1);
}
}
@@ -368,8 +369,7 @@ found_part:
* write GRUB to the MBR. Check for this.
*/
if (log_part && !write_mboot) {
- (void) fprintf(stderr, EXTSOLPAR);
- exit(-1);
+ write_mboot = 1;
}
/*
diff --git a/usr/src/cmd/boot/installgrub/message.h b/usr/src/cmd/boot/installgrub/message.h
index 8bc491f71c..6a2b98069d 100644
--- a/usr/src/cmd/boot/installgrub/message.h
+++ b/usr/src/cmd/boot/installgrub/message.h
@@ -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 @@ extern "C" {
#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")