diff options
| author | dim <dim@FreeBSD.org> | 2016-01-22 20:41:56 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-22 20:41:56 +0000 |
| commit | 7cf07624a0c8bc9de65a351f13206cea487afb48 (patch) | |
| tree | 10bd7a9c1abe1f278df85958745a2a09074c1dda /etc | |
| parent | f011e361d3e821edf47ec30d69116ed25a05b696 (diff) | |
| parent | 66dd616ca8c4d3779be38f549e7e793674dbfd03 (diff) | |
| download | FreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.zip FreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.tar.gz | |
Merge ^/head r294169 through r294598.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 6 | ||||
| -rw-r--r-- | etc/mtree/BSD.include.dist | 2 | ||||
| -rwxr-xr-x | etc/rc.d/ldconfig | 22 | ||||
| -rwxr-xr-x | etc/rc.d/sshd | 4 |
4 files changed, 32 insertions, 2 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 12aaf31..54facb8 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -619,6 +619,9 @@ ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg" # shared library search paths ldconfig32_paths="/usr/lib32 /usr/lib32/compat" # 32-bit compatibility shared library search paths +ldconfigsoft_paths="/usr/libsoft /usr/libsoft/compat /usr/local/libsoft" + # soft float compatibility shared library search paths + # Note: temporarily with extra stuff for transition ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout" # a.out shared library search paths ldconfig_local_dirs="/usr/local/libdata/ldconfig" @@ -626,6 +629,9 @@ ldconfig_local_dirs="/usr/local/libdata/ldconfig" ldconfig_local32_dirs="/usr/local/libdata/ldconfig32" # Local directories with 32-bit compatibility ldconfig # configuration files. +ldconfig_localsoft_dirs="/usr/local/libdata/ldconfigsoft" + # Local directories with soft float compatibility ldconfig + # configuration files. kern_securelevel_enable="NO" # kernel security level (see security(7)) kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure # Note that setting securelevel to 0 will result diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index bb0b26d..88e80e6 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -270,6 +270,8 @@ .. .. netinet + cc + .. .. netinet6 .. diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig index 2dbb5b4..08a2237 100755 --- a/etc/rc.d/ldconfig +++ b/etc/rc.d/ldconfig @@ -61,6 +61,28 @@ ldconfig_start() ;; esac + case `sysctl -n hw.machine_arch` in + armv6) + for i in ${ldconfig_localsoft_dirs}; do + if [ -d "${i}" ]; then + _files=`find ${i} -type f` + if [ -n "${_files}" ]; then + ldconfigsoft_paths="${ldconfigsoft_paths} `cat ${_files} | sort -u`" + fi + fi + done + _LDC="" + for i in ${ldconfigsoft_paths}; do + if [ -r "${i}" ]; then + _LDC="${_LDC} ${i}" + fi + done + check_startmsgs && + echo 'Soft Float compatibility ldconfig path:' ${_LDC} + ${ldconfig} -soft -m ${_ins} ${_LDC} + ;; + esac + # Legacy aout support for i386 only case `sysctl -n hw.machine_arch` in i386) diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd index 9f74716..e6e28c7 100755 --- a/etc/rc.d/sshd +++ b/etc/rc.d/sshd @@ -20,9 +20,9 @@ configtest_cmd="sshd_configtest" pidfile="/var/run/${name}.pid" extra_commands="configtest keygen reload" -: ${sshd_rsa1_enable:="yes"} +: ${sshd_rsa1_enable:="no"} : ${sshd_rsa_enable:="yes"} -: ${sshd_dsa_enable:="yes"} +: ${sshd_dsa_enable:="no"} : ${sshd_ecdsa_enable:="yes"} : ${sshd_ed25519_enable:="yes"} |
