diff options
| author | Toomas Soome <tsoome@me.com> | 2019-04-20 23:25:12 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-09-10 16:31:08 +0300 |
| commit | d7802caee060fef7fc8e8c54b5f61e9efe26ff1e (patch) | |
| tree | ebc06d35deb38750ab5ced9923dee85bfa2d6994 /usr/src/lib/libbe/common/be_activate.c | |
| parent | c3e6a6edd2f8baf75fe85676012b61c894a7dac3 (diff) | |
| download | illumos-joyent-d7802caee060fef7fc8e8c54b5f61e9efe26ff1e.tar.gz | |
11634 installboot should support ESP updates
Reviewed by: Alexander Eremin <a.eremin@nexenta.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libbe/common/be_activate.c')
| -rw-r--r-- | usr/src/lib/libbe/common/be_activate.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/src/lib/libbe/common/be_activate.c b/usr/src/lib/libbe/common/be_activate.c index 9fd95e1e8a..1c2454991d 100644 --- a/usr/src/lib/libbe/common/be_activate.c +++ b/usr/src/lib/libbe/common/be_activate.c @@ -961,9 +961,13 @@ be_do_installboot_helper(zpool_handle_t *zphp, nvlist_t *child, char *stage1, "%s %s %s %s %s", BE_INSTALL_GRUB, flag, stage1, stage2, diskname); } else { + /* + * With updated installboot, we only need boot + * directory. + */ (void) snprintf(install_cmd, sizeof (install_cmd), - "%s %s %s %s %s", BE_INSTALL_BOOT, flag, - stage1, stage2, diskname); + "%s %s -b %s %s", BE_INSTALL_BOOT, flag, + stage1, diskname); } } else if (be_is_isa("sparc")) { if ((flags & BE_INSTALLBOOT_FLAG_FORCE) == @@ -1326,9 +1330,8 @@ be_do_installboot(be_transaction_data_t *bt, uint16_t flags) tmp_mntpt, BE_GRUB_STAGE_2); } else { (void) snprintf(stage1, sizeof (stage1), "%s%s", - tmp_mntpt, BE_LOADER_STAGE_1); - (void) snprintf(stage2, sizeof (stage2), "%s%s", - tmp_mntpt, BE_LOADER_STAGE_2); + tmp_mntpt, BE_LOADER_STAGES); + /* Skip stage2 */ } } else if (be_is_isa("sparc")) { char *platform = be_get_platform(); |