diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2018-09-27 14:31:41 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2018-09-27 14:31:41 +0000 |
| commit | dcf55de22a9f2b6cd074c3c44915ff5c0b906dbb (patch) | |
| tree | c4103fa0cfb81c6b3e1b0305dad7731b27cdf1f5 /sbin | |
| parent | a8e3f99ec190ee5c11413878b7fd75578e542808 (diff) | |
| download | src-dcf55de22a9f2b6cd074c3c44915ff5c0b906dbb.tar.gz src-dcf55de22a9f2b6cd074c3c44915ff5c0b906dbb.zip | |
Remove -m (update) from ldconfig -32 & -soft invocation on startup.
Since r154114 which introduced ldconfig_local32_dirs, ldconfig -32 was
called with -m. This means that ld-elf32.so.hints paths set is not
cleared for compat32 on boot, unlike ld,so,hints. Same -m was used in
r294295 for ld-elf-soft.so.hints on arm. The patch fixes the
asymmetry.
Noted by: Andreas Longwitz <longwitz@incore.de>
Reviewed by: brooks, emaste, imp
Discussed with: bdrewery
Sponsored by: The FreeBSD Foundation
Approved by: re (gjb)
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D17331
Notes
Notes:
svn path=/head/; revision=338964
Diffstat (limited to 'sbin')
| -rwxr-xr-x | sbin/init/rc.d/ldconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/init/rc.d/ldconfig b/sbin/init/rc.d/ldconfig index 3af9562d3bfa..2d2bd143de73 100755 --- a/sbin/init/rc.d/ldconfig +++ b/sbin/init/rc.d/ldconfig @@ -58,7 +58,7 @@ ldconfig_start() done check_startmsgs && echo '32-bit compatibility ldconfig path:' ${_LDC} - ${ldconfig} -32 -m ${_ins} ${_LDC} + ${ldconfig} -32 ${_ins} ${_LDC} ;; esac @@ -80,7 +80,7 @@ ldconfig_start() done check_startmsgs && echo 'Soft Float compatibility ldconfig path:' ${_LDC} - ${ldconfig} -soft -m ${_ins} ${_LDC} + ${ldconfig} -soft ${_ins} ${_LDC} ;; esac |