From 5377e7870dc8bd1c52d05c1ea50177327cf7de4f Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 26 Aug 2014 18:28:07 -0700
Subject: [PATCH] prod_image_util: update /etc/ld.so.conf on every boot

Early images created this as a file instead of a symlink, these systems
will not be able to find the new GCC libraries using the older config.
---
 build_library/prod_image_util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh
index a4f11bfcc2..331236afff 100755
--- a/build_library/prod_image_util.sh
+++ b/build_library/prod_image_util.sh
@@ -67,7 +67,7 @@ create_prod_image() {
   # Add a tmpfiles rule that symlink ld.so.conf from /usr into /
   sudo tee "${root_fs_dir}/usr/lib64/tmpfiles.d/baselayout-ldso.conf" \
       > /dev/null <<EOF
-L   /etc/ld.so.conf     -   -   -   -   ../usr/lib/ld.so.conf
+L+  /etc/ld.so.conf     -   -   -   -   ../usr/lib/ld.so.conf
 EOF
 
   # clear them out explicitly, so this fails if something else gets dropped