Page MenuHomeFreeBSD
Files F167472949

D58836.diff
No OneTemporary
Actions

D58836.diff
View Options

diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -165,7 +165,7 @@
kern_unsetenv("kern.geom.eli.passphrase");
}
}
-SYSINIT(geli_fetch_loader_passphrase, SI_SUB_KMEM, SI_ORDER_LAST,
+SYSINIT(geli_fetch_loader_passphrase, SI_SUB_KENV, SI_ORDER_ANY,
fetch_loader_passphrase, NULL);
static void
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -511,7 +511,7 @@
mtx_init(&kenv_lock, "kernel environment", NULL, MTX_DEF);
dynamic_kenv = true;
}
-SYSINIT(kenv, SI_SUB_KMEM, SI_ORDER_LAST, init_dynamic_kenv, NULL);
+SYSINIT(kenv, SI_SUB_KENV, SI_ORDER_FIRST, init_dynamic_kenv, NULL);
void
freeenv(char *env)
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
--- a/sys/kern/subr_hints.c
+++ b/sys/kern/subr_hints.c
@@ -88,7 +88,7 @@
}
/* Any time after dynamic env is setup */
-SYSINIT(hintenv, SI_SUB_KMEM, SI_ORDER_LAST, static_hints_to_env, NULL);
+SYSINIT(hintenv, SI_SUB_KENV, SI_ORDER_ANY, static_hints_to_env, NULL);
/*
* Checks the environment to see if we even have any hints. If it has no hints,
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -101,6 +101,7 @@
SI_SUB_VM = 0x1000000, /* virtual memory system init */
SI_SUB_COUNTER = 0x1100000, /* counter(9) is initialized */
SI_SUB_KMEM = 0x1800000, /* kernel memory */
+ SI_SUB_KENV = 0x1900000, /* kernel environment */
SI_SUB_HYPERVISOR = 0x1A40000, /*
* Hypervisor detection and
* virtualization support

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 1:02 AM (8 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37021822
Default Alt Text
D58836.diff (1 KB)

Event Timeline