diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2019-10-16 18:33:31 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2019-10-16 18:33:31 +0000 |
| commit | 1dc85563587263c6b3c7d04dfdcbdc17865b5e8b (patch) | |
| tree | a8f90409f4e4a64f22224a86408b9df4abc0c9eb /lib/libbe | |
| parent | f677fed5a2b82b38633cd4e3ceeb6fdbe2cbf24b (diff) | |
Notes
Diffstat (limited to 'lib/libbe')
| -rw-r--r-- | lib/libbe/be.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libbe/be.c b/lib/libbe/be.c index fb27d7a2855b..fd7d05c408eb 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -229,7 +229,7 @@ be_destroy_cb(zfs_handle_t *zfs_hdl, void *data) return (0); } -#define BE_DESTROY_NEEDORIGIN (BE_DESTROY_ORIGIN | BE_DESTROY_AUTOORIGIN) +#define BE_DESTROY_WANTORIGIN (BE_DESTROY_ORIGIN | BE_DESTROY_AUTOORIGIN) /* * Destroy the boot environment or snapshot specified by the name * parameter. Options are or'd together with the possible values: @@ -265,9 +265,10 @@ be_destroy(libbe_handle_t *lbh, const char *name, int options) if (fs == NULL) return (set_error(lbh, BE_ERR_ZFSOPEN)); - if ((options & BE_DESTROY_NEEDORIGIN) != 0 && + if ((options & BE_DESTROY_WANTORIGIN) != 0 && zfs_prop_get(fs, ZFS_PROP_ORIGIN, origin, sizeof(origin), - NULL, NULL, 0, 1) != 0) + NULL, NULL, 0, 1) != 0 && + (options & BE_DESTROY_ORIGIN) != 0) return (set_error(lbh, BE_ERR_NOORIGIN)); /* @@ -279,7 +280,7 @@ be_destroy(libbe_handle_t *lbh, const char *name, int options) * the caller can determine if it needs to warn about the origin * not being destroyed or not. */ - if ((options & BE_DESTROY_AUTOORIGIN) != 0 && + if ((options & BE_DESTROY_AUTOORIGIN) != 0 && *origin != '\0' && be_is_auto_snapshot_name(lbh, origin)) options |= BE_DESTROY_ORIGIN; |