d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check rootvnode variable to see if we still want to ask for passphrase on

Browse Source 
boot. Other methods just don't work properly.

MFC after:	3 days
This commit is contained in:
Pawel Jakub Dawidek 2006-02-11 12:45:01 +00:00
parent e8444a7e6f
commit a80f82a4a3
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/geom/eli/g_eli.c
View File

@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sched.h>
#include <sys/smp.h>
#include <sys/uio.h>
#include <sys/vnode.h>
#include <vm/uma.h>
@ -74,8 +75,6 @@ TUNABLE_INT("kern.geom.eli.threads", &g_eli_threads);
SYSCTL_UINT(_kern_geom_eli, OID_AUTO, threads, CTLFLAG_RW, &g_eli_threads, 0,
"Number of threads doing crypto work");
static int g_eli_do_taste = 0;
static int g_eli_destroy_geom(struct gctl_req *req, struct g_class *mp,
struct g_geom *gp);
static void g_eli_crypto_run(struct g_eli_worker *wr, struct bio *bp);
@ -909,7 +908,7 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, pp->name);
g_topology_assert();
if (!g_eli_do_taste || g_eli_tries == 0)
if (rootvnode != NULL || g_eli_tries == 0)
return (NULL);
G_ELI_DEBUG(3, "Tasting %s.", pp->name);
@ -1063,30 +1062,5 @@ g_eli_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp,
g_eli_algo2str(sc->sc_algo));
}
static void
g_eli_on_boot_start(void *dummy __unused)
{
/* This prevents from tasting when module is loaded after boot. */
if (cold) {
G_ELI_DEBUG(1, "Start tasting.");
g_eli_do_taste = 1;
} else {
G_ELI_DEBUG(1, "Tasting not started.");
}
}
SYSINIT(geli_boot_start, SI_SUB_TUNABLES, SI_ORDER_ANY, g_eli_on_boot_start, NULL)
static void
g_eli_on_boot_end(void *dummy __unused)
{
if (g_eli_do_taste) {
G_ELI_DEBUG(1, "Tasting no more.");
g_eli_do_taste = 0;
}
}
SYSINIT(geli_boot_end, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, g_eli_on_boot_end, NULL)
DECLARE_GEOM_CLASS(g_eli_class, g_eli);
MODULE_DEPEND(geom_eli, crypto, 1, 1, 1);

2
sys/modules/geom/geom_eli/Makefile
View File

@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../geom/eli
KMOD= geom_eli
SRCS= g_eli.c g_eli_crypto.c g_eli_ctl.c g_eli_key.c pkcs5v2.c
SRCS= g_eli.c g_eli_crypto.c g_eli_ctl.c g_eli_key.c pkcs5v2.c vnode_if.h
WARNS?= 2
.include <bsd.kmod.mk>