diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2018-10-12 09:52:37 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-10-17 09:58:08 -0400 |
| commit | a897f28bdf15b072de311fba1dadf86da4f4b420 (patch) | |
| tree | 10cb5591e050b40b1b050b547f3a4e620fa42893 /usr/src/cmd | |
| parent | 4ac23efef166d029b8dda8f16179b1ab9a70c27a (diff) | |
| download | illumos-gate-a897f28bdf15b072de311fba1dadf86da4f4b420.tar.gz | |
9892 Most consumers of be_list() do not need snapshots
Reviewed by: Dominik Hassler <hadfl@omniosce.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Jim Klimov <jim@cos.ru>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/beadm/beadm.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm.c | 6 | ||||
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm_loader.c | 9 |
3 files changed, 11 insertions, 8 deletions
diff --git a/usr/src/cmd/beadm/beadm.c b/usr/src/cmd/beadm/beadm.c index 3667c762a4..ee18dcdcb5 100644 --- a/usr/src/cmd/beadm/beadm.c +++ b/usr/src/cmd/beadm/beadm.c @@ -26,6 +26,7 @@ * Copyright 2015 Gary Mills * Copyright (c) 2015 by Delphix. All rights reserved. * Copyright 2017 Jason King + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ /* @@ -1147,7 +1148,8 @@ be_do_list(int argc, char **argv) if (argc == 1) be_name = argv[0]; - err = be_list(be_name, &be_nodes); + err = be_list(be_name, &be_nodes, + snaps ? BE_LIST_SNAPSHOTS : BE_LIST_DEFAULT); switch (err) { case BE_SUCCESS: diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index bedca2a6b5..36d167fafb 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -1137,7 +1137,7 @@ install_bootloader(void) goto done; } - if (be_list(NULL, &be_nodes) != BE_SUCCESS) { + if (be_list(NULL, &be_nodes, BE_LIST_DEFAULT) != BE_SUCCESS) { bam_error(_("No BE's found\n")); goto done; } @@ -1197,7 +1197,7 @@ install_bootloader(void) } } - if (be_list(NULL, &be_nodes) != BE_SUCCESS) { + if (be_list(NULL, &be_nodes, BE_LIST_DEFAULT) != BE_SUCCESS) { bam_error(_("No BE's found\n")); ret = BAM_ERROR; goto done; @@ -3312,7 +3312,7 @@ is_be(char *root) /* * Check if the current dataset is BE */ - if (be_list(NULL, &be_nodes) == BE_SUCCESS) { + if (be_list(NULL, &be_nodes, BE_LIST_DEFAULT) == BE_SUCCESS) { for (cur_be = be_nodes; cur_be != NULL; cur_be = cur_be->be_next_node) { diff --git a/usr/src/cmd/boot/bootadm/bootadm_loader.c b/usr/src/cmd/boot/bootadm/bootadm_loader.c index 56b509b9ed..6f96f4b053 100644 --- a/usr/src/cmd/boot/bootadm/bootadm_loader.c +++ b/usr/src/cmd/boot/bootadm/bootadm_loader.c @@ -26,6 +26,7 @@ /* * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2016 Toomas Soome <tsoome@me.com> + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ /* @@ -282,7 +283,7 @@ menu_read(struct menu_lst *menu, char *menu_path) if (fp == NULL) return (BAM_ERROR); - if (be_list(NULL, &be_nodes) != BE_SUCCESS) + if (be_list(NULL, &be_nodes, BE_LIST_DEFAULT) != BE_SUCCESS) be_nodes = NULL; /* @@ -718,7 +719,7 @@ bam_mount_be(menu_entry_t *entry, char **dir) goto out; } - ret = be_list(NULL, &be_nodes); + ret = be_list(NULL, &be_nodes, BE_LIST_DEFAULT); if (ret != BE_SUCCESS) { goto out; } @@ -1028,7 +1029,7 @@ update_entry(struct menu_lst *menu, char *menu_root, char *osdev) FILE *fp; (void) snprintf(path, PATH_MAX, "%s%s", menu_root, MENU); - rv = be_list(NULL, &be_nodes); + rv = be_list(NULL, &be_nodes, BE_LIST_DEFAULT); if (rv != BE_SUCCESS) return (BAM_ERROR); @@ -1205,7 +1206,7 @@ list_setting(struct menu_lst *menu, char *which, char *setting) /* find default entry */ if (entry == -1) { - ret = be_list(NULL, &be_nodes); + ret = be_list(NULL, &be_nodes, BE_LIST_DEFAULT); if (ret != BE_SUCCESS) { bam_error(_("No BE's found\n")); return (BAM_ERROR); |