The geom_eli module lacks version information. When a kernel has the geom_eli module compiled in, but bsdinstall told the loader to load the module via loader.conf (for example, full-disk encrypted setups), the kernel will reload the module later on in the boot process, causing geli to wipe the cached passphrase and prompt the user a second time for it. Setting the module version should tell the kernel to only load it once.
Diff Detail
Diff Detail
- Lint
Lint Skipped - Unit
Tests Skipped
Event Timeline
sys/geom/eli/g_eli.c | ||
---|---|---|
1335 | Rather than '1' as the value here, I think you want to use 'G_ELI_VERSION' from g_eli.h When we upgrade GELI to version 8 in the future, this will make a difference. |
sys/geom/eli/g_eli.c | ||
---|---|---|
1335 | Good call. I'll update the revision with that change. |
Comment Actions
So there's already this at the end of the file:
MODULE_VERSION(geom_eli, 0);
from r332387.
sys/geom/eli/g_eli.c | ||
---|---|---|
1335 | I don't think that this version is the same as the G_ELI_VERSION... |
Comment Actions
Looks like that commit was made after this patch was posted for review. Given that it now includes MODULE_VERSION (but without using G_ELI_VERSION), we can probably just keep with what was committed. Should I close this review?