Skip to content

Commit 31db7ba

Browse files
gmelikovwq9578
andcommitted
Compatibility matrix: add note about Illumos encryption interoperability
Co-authored-by: wq9578 <[email protected]>
1 parent 09de963 commit 31db7ba

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

scripts/compatibility_matrix.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def nexenta():
169169

170170

171171
openzfs_key = 'OpenZFS (Linux, FreeBSD 13+)'
172+
illumos_key = 'Illumos'
172173
sources = {
173174
openzfs_key: openzfs(),
174175
'FreeBSD pre OpenZFS': freebsd_pre_openzfs(),
@@ -177,7 +178,7 @@ def nexenta():
177178
'Joyent': joyent(),
178179
'NetBSD': netbsd(),
179180
'Nexenta': nexenta(),
180-
'Illumos': {
181+
illumos_key: {
181182
'master': 'https://raw.githubusercontent.com/illumos/illumos-gate/'
182183
'master/usr/src/man/man7/zpool-features.7',
183184
},
@@ -343,11 +344,12 @@ def nexenta():
343344
html.write('<td class="warn">no</td>')
344345
for name, vers in header:
345346
for ver in vers:
346-
# custom case for OpenZFS FreeBSD https://github.com/openzfs/zfs/pull/12735
347347
if (feature == 'edonr' and name == openzfs_key and '.' in ver
348348
and not (int(ver.split('.')[0]) >= 2
349349
and int(ver.split('.')[1]) >= 2)):
350-
html.write('<td class="yes">yes<sup><a href="#note_1">1</a></sup></td>')
350+
html.write('<td class="warn">yes<sup><a href="#note_1">1</a></sup></td>')
351+
elif (feature == 'encryption' and name == illumos_key):
352+
html.write('<td class="warn">yes<sup><a href="#note_2">2</a></sup></td>')
351353
elif (name, ver) in names:
352354
html.write('<td class="yes">yes</td>')
353355
else:
@@ -358,6 +360,7 @@ def nexenta():
358360
html.write('<h3>Notes:</h3>\n')
359361
html.write('<ol>\n')
360362
html.write('<li id="note_1"><a href="https://github.com/openzfs/zfs/pull/12735">Edonr support was not enabled in FreeBSD with OpenZFS up to 2.1 release included</a></li>\n')
363+
html.write('<li id="note_2"><a href="https://illumos.topicbox.com/groups/discuss/Ta2162fbb2358fa0e">While Illumos have nearly same encryption logic, it\'s format is not 100% compatible with OpenZFS encryption format, so you may have problems with cross-platform encryption.</a></li>\n')
361364
html.write('</ol>\n')
362365
html.write('</div>\n')
363366
now = datetime.now().isoformat() + 'Z'

0 commit comments

Comments
 (0)