Commit 8ecaf5f9 authored by Franco Fichtner's avatar Franco Fichtner

system: kernel modules are static, move them to loader.conf

parent 51e40597
...@@ -1820,57 +1820,6 @@ function get_possible_traffic_source_addresses($include_ipv6_link_local=false) { ...@@ -1820,57 +1820,6 @@ function get_possible_traffic_source_addresses($include_ipv6_link_local=false) {
return $sourceips; return $sourceips;
} }
function load_kernel_module()
{
$mods = array(
'carp',
'if_bridge',
/*
* The netgraph(4) framework is loaded here
* for backwards compat with the pre-16.7
* kernel configuration that compiled all of
* these modules into the kernel. This list
* needs further pruning and probing, it's
* possible we do not need frame relay anymore.
*/
'netgraph',
'ng_UI',
'ng_async',
'ng_bpf',
'ng_bridge',
'ng_car',
'ng_cisco',
'ng_deflate',
'ng_echo',
'ng_eiface',
'ng_ether',
'ng_frame_relay',
'ng_hole',
'ng_iface',
'ng_ksocket',
'ng_l2tp',
'ng_lmi',
'ng_mppc',
'ng_one2many',
'ng_pipe',
'ng_ppp',
'ng_pppoe',
'ng_pptpgre',
'ng_pred1',
'ng_rfc1490',
'ng_socket',
'ng_tcpmss',
'ng_tee',
'ng_tty',
'ng_vjc',
'ng_vlan',
);
foreach ($mods as $mod) {
mwexecf('/sbin/kldload %s', $mod);
}
}
function load_crypto_module() function load_crypto_module()
{ {
global $config; global $config;
......
...@@ -143,9 +143,6 @@ if (is_interface_mismatch()) { ...@@ -143,9 +143,6 @@ if (is_interface_mismatch()) {
while (!set_networking_interfaces_ports(true)); while (!set_networking_interfaces_ports(true));
} }
/* load extra modules not in GENERIC */
load_kernel_module();
/* enable optional crypto modules */ /* enable optional crypto modules */
load_crypto_module(); load_crypto_module();
......
############################################################## ##############################################################
# This file was auto-generated using the rc.loader facility. # # This file was auto-generated using the rc.loader facility. #
# In order to deploy a custom change to this installation, # # In order to deploy a custom change to this installation, #
# please use /boot/loader.conf.local as it is not written. # # please use /boot/loader.conf.local as it is not rewritten. #
############################################################## ##############################################################
carp_load="YES"
if_bridge_load="YES"
# The netgraph(4) framework is loaded here
# for backwards compat with the pre-16.7
# kernel configuration that compiled all of
# these modules into the kernel. This list
# needs further pruning and probing, it's
# possible we do not need frame relay anymore.
netgraph_load="YES"
ng_UI_load="YES"
ng_async_load="YES"
ng_bpf_load="YES"
ng_bridge_load="YES"
ng_car_load="YES"
ng_cisco_load="YES"
ng_deflate_load="YES"
ng_echo_load="YES"
ng_eiface_load="YES"
ng_ether_load="YES"
ng_frame_relay_load="YES"
ng_hole_load="YES"
ng_iface_load="YES"
ng_ksocket_load="YES"
ng_l2tp_load="YES"
ng_lmi_load="YES"
ng_mppc_load="YES"
ng_one2many_load="YES"
ng_pipe_load="YES"
ng_ppp_load="YES"
ng_pppoe_load="YES"
ng_pptpgre_load="YES"
ng_pred1_load="YES"
ng_rfc1490_load="YES"
ng_socket_load="YES"
ng_tcpmss_load="YES"
ng_tee_load="YES"
ng_tty_load="YES"
ng_vjc_load="YES"
ng_vlan_load="YES"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment