diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-17 09:59:28 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-17 09:59:28 -0300 |
| commit | 89ba6d490219156dc7e7779431d9de445220df9d (patch) | |
| tree | 714514bba8b7b4581df0f7be45c61b01049b6b4f /etc | |
| parent | 56930d706911fdcf5e574a23ce39a1757907ee67 (diff) | |
| parent | 3ea5fe04508eac3ddd7ebff9a4049f219d3037a6 (diff) | |
| download | FreeBSD-src-89ba6d490219156dc7e7779431d9de445220df9d.zip FreeBSD-src-89ba6d490219156dc7e7779431d9de445220df9d.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/abi | 5 | ||||
| -rwxr-xr-x | etc/rc.d/netwait | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/etc/rc.d/abi b/etc/rc.d/abi index 3765b05..5021843 100755 --- a/etc/rc.d/abi +++ b/etc/rc.d/abi @@ -27,6 +27,11 @@ linux_start() echo -n ' linux' load_kld -e 'linux(aout|elf)' linux + case `sysctl -n hw.machine_arch` in + amd64) + load_kld -e 'linux64elf' linux64 + ;; + esac if [ -x /compat/linux/sbin/ldconfigDisabled ]; then _tmpdir=`mktemp -d -t linux-ldconfig` /compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache diff --git a/etc/rc.d/netwait b/etc/rc.d/netwait index 6ccca04..e9c23ca 100755 --- a/etc/rc.d/netwait +++ b/etc/rc.d/netwait @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: netwait -# REQUIRE: devd routing +# REQUIRE: devd ipfilter ipfw pf routing # KEYWORD: nojail # # The netwait script helps handle two situations: |
