33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
Index: usr.sbin/freebsd-update/freebsd-update.sh
|
|
===================================================================
|
|
--- usr.sbin/freebsd-update/freebsd-update.sh (revision 278336)
|
|
+++ usr.sbin/freebsd-update/freebsd-update.sh (revision 278337)
|
|
@@ -2828,9 +2828,16 @@ Kernel updates have been installed. Please reboot
|
|
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
|
|
|
|
@@ -2837,9 +2844,11 @@ Kernel updates have been installed. Please reboot
|
|
# 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
|