svn commit: r338964 - head/sbin/init/rc.d

[Konstantin Belousov]

Author: kib
Date: Thu Sep 27 14:31:41 2018
New Revision: 338964
URL: https://svnweb.freebsd.org/changeset/base/338964

Log:
  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 at 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

Modified:
  head/sbin/init/rc.d/ldconfig

Modified: head/sbin/init/rc.d/ldconfig
==============================================================================
--- head/sbin/init/rc.d/ldconfig	Thu Sep 27 14:05:44 2018	(r338963)
+++ head/sbin/init/rc.d/ldconfig	Thu Sep 27 14:31:41 2018	(r338964)
@@ -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