From 09b94270487e8e4d5884878b230fe5f73b8cdf43 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:27:43 +0000 Subject: [PATCH] Stefan Fiedler: target/bootdisk/build_stage1.sh: skip comments when reading etc/ld.so.conf [2007100422340122584] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8768 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/bootdisk/build_stage1.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/bootdisk/build_stage1.sh b/target/bootdisk/build_stage1.sh index 49d8f335f..4a56c763a 100644 --- a/target/bootdisk/build_stage1.sh +++ b/target/bootdisk/build_stage1.sh @@ -65,7 +65,9 @@ sed -i -e "s,^STAGE_2_BIG_IMAGE=\"2nd_stage.tar.gz\"$,STAGE_2_BIG_IMAGE=\"${ROCK -e "s,^STAGE_2_SMALL_IMAGE=\"2nd_stage_small.tar.gz\"$,STAGE_2_SMALL_IMAGE=\"${ROCKCFG_SHORTID}/2nd_stage_small.tar.gz\"," \ sbin/init -libdirs="${rootdir}/lib `sed -e"s,^\(.*\),${rootdir}\1," ${rootdir}/etc/ld.so.conf | tr '\n' ' '`" +libdirs="${rootdir}/$multilib ${rootdir}/usr/$multilib \ + `sed -r -e'/^[ ]*(#|$)/ d' -e"s,^(.*),${rootdir}\1," -e"s,/lib(/|$),/$multilib\1,p" \ + ${rootdir}/etc/ld.so.conf | uniq | tr '\n' ' '`" needed_libs() { local x="${1}" library