geli init multiple providers
ClosedPublic
Actions

Authored by woodsb02 on Jul 3 2018, 5:53 PM.

Details

Reviewers

allanjude
oshogbo
sobomax
cperciva
asomers

Group Reviewers

manpages

Commits

rS336659: geli init: Allow initialization of multiple geli providers at once if

Summary

geli init multiple providers

Following on from rS335673 and rS336602 which allowed multiple providers to be attached in a single command.

Allow initialization of multiple geli providers at once if they use same
passphrase and keyfiles.
Unique salt will be randomly generated for each provider to ensure the
Master Key for each is unique.

Test Plan

Tested using md(4) memory disks to confirm multiple providers can be initialized
in a single command using the same passphrase and keyfiles.

mdconfig -s 1m -u 0
mdconfig -s 1m -u 1
geli init md0 md2 md1   # set password to "test"
geli attach -v md0 md1  # enter password "test"
geli status
geli detach md0 md1
mdconfig -d -u 0
mdconfig -d -u 1

Expected output:

Enter new passphrase:
Reenter new passphrase:
Calculating number of iterations...
Done, using 2071395 iterations.
Metadata value stored on md0.

Metadata backup for provider md0 can be found in /var/backups/md0.eli
and can be restored with the following command:

        # geli restore /var/backups/md0.eli md0

geli: Cannot get informations about md2: No such file or directory.
Metadata value stored on md1.

Metadata backup for provider md1 can be found in /var/backups/md1.eli
and can be restored with the following command:

        # geli restore /var/backups/md1.eli md1

geli: There was an error with at least one provider.

Enter passphrase:
Attached to md0.
Attached to md1.
Done.

      Name  Status  Components
   md0.eli  ACTIVE  md0
   md1.eli  ACTIVE  md1

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

woodsb02 created this revision.Jul 3 2018, 5:53 PM

Herald added a reviewer: manpages. · View Herald TranscriptJul 3 2018, 5:53 PM

Herald added a subscriber: imp. · View Herald Transcript

Harbormaster completed remote builds in B17819: Diff 44820.Jul 3 2018, 5:53 PM

Minor wording nit in the man page.

lib/geom/eli/geli.8
239 ↗	(On Diff #44820)	s/Unique/A unique/

woodsb02 marked an inline comment as done.Jul 5 2018, 2:53 PM

Incorporate manpage comment from bcr

Harbormaster completed remote builds in B17859: Diff 44906.Jul 5 2018, 2:54 PM

woodsb02 edited the summary of this revision. (Show Details)Jul 5 2018, 2:55 PM

Colin specifically asked me about this feature at BSDCan, so has therefore volunteered to help test it.

Update style to match r336602

Harbormaster completed remote builds in B18245: Diff 45683.Jul 22 2018, 1:51 PM

woodsb02 edited the summary of this revision. (Show Details)Jul 22 2018, 1:52 PM

woodsb02 added a reviewer: asomers.Jul 22 2018, 10:33 PM

You really should add some tests for this. geli has a good test suite already; it should be easy to add this feature. If you've never used ATF before, I can help you with that.

lib/geom/eli/geli.8
27 ↗	(On Diff #45683)	Don't forget to bump the date.
lib/geom/eli/geom_eli.c
710 ↗	(On Diff #45683)	Better to use `<=`
845 ↗	(On Diff #45683)	80 columns per line here and elsewhere.

This revision now requires changes to proceed.Jul 22 2018, 10:58 PM

Looks good to me.

woodsb02 marked 3 inline comments as done.Jul 23 2018, 11:01 PM

This revision was not accepted when it landed; it landed in state Needs Revision.Jul 23 2018, 11:04 PM

Closed by commit rS336659: geli init: Allow initialization of multiple geli providers at once if (authored by woodsb02). · Explain Why

This revision was automatically updated to reflect the committed changes.

Thanks for your review Alan and Maxim.
Alan: I will try to create some tests for this new geli functionality this weekend, and will submit a phabricator review once it is ready. I am new to Kyua tests, so we will see how it goes.