svn commit: r278337 - head/usr.sbin/freebsd-update

[Brooks Davis]

Author: brooks
Date: Fri Feb  6 23:44:16 2015
New Revision: 278337
URL: https://svnweb.freebsd.org/changeset/base/278337

Log:
  When upgrading, install the ELF runtime linkers before libraries.
  
  This is required to prevent problems with nss modules that use libthr when
  upgrading from releases prior to 10.1.
  
  PR:		197366
  Sponsored by:	DARPA, AFRL
  Differential Revision:	D1790
  Reviewed by:	cperciva
  MFC after:	3 days

Modified:
  head/usr.sbin/freebsd-update/freebsd-update.sh

Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh	Fri Feb  6 23:34:40 2015	(r278336)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Fri Feb  6 23:44:16 2015	(r278337)
@@ -2828,18 +2828,27 @@ Kernel updates have been installed.  Ple
 		    grep -E '^[^|]+\|d\|' > INDEX-NEW
 		install_from_index INDEX-NEW || return 1
 
+		# Install new runtime linker
+		grep -vE '^/boot/' $1/INDEX-NEW |
+		    grep -vE '^[^|]+\|d\|' |
+		    grep -E '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' > INDEX-NEW
+		install_from_index INDEX-NEW || return 1
+
 		# Install new shared libraries next
 		grep -vE '^/boot/' $1/INDEX-NEW |
 		    grep -vE '^[^|]+\|d\|' |
+		    grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' |
 		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
 		install_from_index INDEX-NEW || return 1
 
 		# Deal with everything else
 		grep -vE '^/boot/' $1/INDEX-OLD |
 		    grep -vE '^[^|]+\|d\|' |
+		    grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' |
 		    grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-OLD
 		grep -vE '^/boot/' $1/INDEX-NEW |
 		    grep -vE '^[^|]+\|d\|' |
+		    grep -vE '^/libexec/ld-elf[^|]*\.so\.[0-9]+\|' |
 		    grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
 		install_from_index INDEX-NEW || return 1
 		install_delete INDEX-OLD INDEX-NEW || return 1