diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2018-04-25 09:09:17 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-04-25 13:53:53 -0400 |
| commit | 5850749aaf781e7f284cedc8429eb16adf367802 (patch) | |
| tree | ef9b08ed34e6b91c6228a491e174e46660025c13 | |
| parent | bf8c808aff646a7e2006c1a6fe7bcd596ce78105 (diff) | |
| download | illumos-joyent-5850749aaf781e7f284cedc8429eb16adf367802.tar.gz | |
9501 bootadm update-archive -nvC does more ZFS work than required
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index b2bfc4e849..0444c5cda7 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -25,6 +25,7 @@ * Copyright (c) 2015 by Delphix. All rights reserved. * Copyright 2016 Toomas Soome <tsoome@me.com> * Copyright 2016 Nexenta Systems, Inc. + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ /* @@ -4074,7 +4075,7 @@ update_archive(char *root, char *opt) /* * Never update non-BE root in update_all */ - if (!is_be(root) && bam_update_all) + if (bam_update_all && !is_be(root)) return (BAM_SUCCESS); /* * root must belong to a boot archive based OS, |