From 66f18efa654be2a490581b727f9b09dcd174aded Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 31 Aug 2015 13:32:29 +0300 Subject: [PATCH] 6159 libbe should proactively handle future architectures Reviewed by: Josef Sipek Reviewed by: Dan McDonald Approved by: Richard Lowe --- usr/src/lib/libbe/common/be_activate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr/src/lib/libbe/common/be_activate.c b/usr/src/lib/libbe/common/be_activate.c index 6eda8eebba..feb6fc46b5 100644 --- a/usr/src/lib/libbe/common/be_activate.c +++ b/usr/src/lib/libbe/common/be_activate.c @@ -933,7 +933,7 @@ be_do_installboot_helper(zpool_handle_t *zphp, nvlist_t *child, char *stage1, (void) snprintf(install_cmd, sizeof (install_cmd), "%s %s %s %s %s", BE_INSTALL_GRUB, flag, stage1, stage2, diskname); - } else { + } else if (be_is_isa("sparc")) { if ((flags & BE_INSTALLBOOT_FLAG_FORCE) == BE_INSTALLBOOT_FLAG_FORCE) flag = "-f -F zfs"; @@ -942,6 +942,10 @@ be_do_installboot_helper(zpool_handle_t *zphp, nvlist_t *child, char *stage1, (void) snprintf(install_cmd, sizeof (install_cmd), "%s %s %s %s", BE_INSTALL_BOOT, flag, stage2, diskname); + } else { + be_print_err(gettext("be_do_installboot: unsupported " + "architecture.\n")); + return (BE_ERR_BOOTFILE_INST); } *be_run_cmd_outbuf = '\0'; -- 2.11.4.GIT