diff options
| author | Toomas Soome <tsoome@me.com> | 2015-08-31 13:32:29 +0300 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2015-09-23 12:07:23 -0400 |
| commit | 66f18efa654be2a490581b727f9b09dcd174aded (patch) | |
| tree | 7cf8adf820a7a8973e5f517e1afe4a1504fe92b2 /usr/src/lib/libbe | |
| parent | c531777d2c205ea8626ed21b13dfe1e0b6e25b60 (diff) | |
| download | illumos-joyent-66f18efa654be2a490581b727f9b09dcd174aded.tar.gz | |
6159 libbe should proactively handle future architectures
Reviewed by: Josef Sipek <jeffpc@josefsipek.net>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libbe')
| -rw-r--r-- | usr/src/lib/libbe/common/be_activate.c | 6 |
1 files changed, 5 insertions, 1 deletions
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'; |