diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-06-26 18:43:46 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-06-28 11:04:38 +0000 |
| commit | 42b4b09e4b7ff97dc2592e69bbc2aff411cb9e55 (patch) | |
| tree | c32c30aa217f73528075fcee6b93aacb360750b0 /usr | |
| parent | e1a5df12e67cd370138ad95c737fb5436fbb2131 (diff) | |
| download | illumos-joyent-42b4b09e4b7ff97dc2592e69bbc2aff411cb9e55.tar.gz | |
11277 Loader cannot boot from root pool with encryption enabled
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/lib/libstand/zfs/zfsimpl.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index ff8cecbbf6..a293a6a2fa 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2019.05.29.1 +BOOT_VERSION = $(LOADER_VERSION)-2019.06.26.1 diff --git a/usr/src/boot/lib/libstand/zfs/zfsimpl.c b/usr/src/boot/lib/libstand/zfs/zfsimpl.c index 328994ae86..8bea34b522 100644 --- a/usr/src/boot/lib/libstand/zfs/zfsimpl.c +++ b/usr/src/boot/lib/libstand/zfs/zfsimpl.c @@ -63,6 +63,13 @@ static const char *features_for_read[] = { "org.illumos:edonr", "org.zfsonlinux:large_dnode", "com.joyent:multi_vdev_crash_dump", + "com.delphix:spacemap_histogram", + "com.delphix:zpool_checkpoint", + "com.delphix:spacemap_v2", + "com.datto:encryption", + "com.datto:bookmark_v2", + "org.zfsonlinux:allocation_classes", + "com.datto:resilver_defer", NULL }; @@ -1358,7 +1365,7 @@ dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, /* * The buffer contains our data block. Copy what we * need from it and loop. - */ + */ i = bsize - boff; if (i > buflen) i = buflen; memcpy(buf, &dnode_cache_buf[boff], i); @@ -1414,7 +1421,7 @@ fzap_name_equal(const zap_leaf_t *zl, const zap_leaf_chunk_t *zc, const char *na const char *p; namelen = zc->l_entry.le_name_numints; - + nc = &ZAP_LEAF_CHUNK(zl, zc->l_entry.le_name_chunk); p = name; while (namelen > 0) { |