Skip to content

integritysetup: support mode=(journal|bitmap|direct) - #27973

Merged
bluca merged 1 commit into
systemd:mainfrom
aklomp:issue-27587
Jun 8, 2023
Merged

integritysetup: support mode=(journal|bitmap|direct)#27973
bluca merged 1 commit into
systemd:mainfrom
aklomp:issue-27587

Conversation

@aklomp

@aklomp aklomp commented Jun 8, 2023

Copy link
Copy Markdown
Contributor

Add a parameter to the integritytab file to set the mode in which to open the integrity volume. The mode can be journaled (the default), bitmap without a journal, or direct mode without a journal or a bitmap.

This change removes the no-journal option because it is redundant, being replaced with mode=direct.

Supercedes commit bcc1ee5, from a week ago, which implemented no-journal.

Resolves #27587

@github-actions github-actions Bot added documentation please-review PR is ready for (re-)review by a maintainer labels Jun 8, 2023
@aklomp

aklomp commented Jun 8, 2023

Copy link
Copy Markdown
Contributor Author

@eatnumber1 This PR supercedes your commit (PR #27824) that implemented no-journal in integritytab. Do you agree with this change?

@aklomp

aklomp commented Jun 8, 2023

Copy link
Copy Markdown
Contributor Author

NB, I didn't actually compile or test this code! It's trivial enough that I hope it's acceptable.

Comment thread src/integritysetup/integrity-util.c
Comment thread src/integritysetup/integrity-util.c Outdated
Comment thread src/integritysetup/integrity-util.c Outdated
@poettering poettering added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks integritysetup and removed please-review PR is ready for (re-)review by a maintainer labels Jun 8, 2023
@github-actions github-actions Bot added please-review PR is ready for (re-)review by a maintainer and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Jun 8, 2023
Comment thread src/integritysetup/integrity-util.c Outdated
@poettering poettering added good-to-merge/with-minor-suggestions and removed please-review PR is ready for (re-)review by a maintainer labels Jun 8, 2023
@poettering

Copy link
Copy Markdown
Member

one more fix, and we are good to go

Add a parameter to the integritytab file to set the mode in which to
open the integrity volume. The mode can be journaled (the default),
bitmap without a journal, or direct mode without a journal or a bitmap.

This change removes the `no-journal' option because it is redundant,
being replaced with `mode=direct'.

Supercedes commit bcc1ee5, from a week ago, which implemented
`no-journal'.

Resolves systemd#27587
@bluca bluca added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed documentation good-to-merge/with-minor-suggestions labels Jun 8, 2023
@bluca
bluca merged commit a2160ba into systemd:main Jun 8, 2023
@github-actions github-actions Bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jun 8, 2023
@eatnumber1

Copy link
Copy Markdown
Contributor

@eatnumber1 This PR supercedes your commit (PR #27824) that implemented no-journal in integritytab. Do you agree with this change?

Yes! This way is better than my change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

Please support bitmap mode in integritytab

4 participants