fix rcynic linux installation script to work on x86_64

svn path=/rcynic/installation-scripts/linux/install.sh.in; revision=3759

1 files changed, 12 insertions, 5 deletions

diff --git a/rcynic/installation-scripts/linux/install.sh.in b/rcynic/installation-scripts/linux/install.sh.in
index b414fa36..afaeda99 100644
--- a/rcynic/installation-scripts/linux/install.sh.in
+++ b/rcynic/installation-scripts/linux/install.sh.in
@@ -31,7 +31,7 @@ fi
 # avoid creating the associated group.
 nogroup='-N'
 if test -f /etc/redhat-release; then
-	cat /etc/redhat-release | read vendor release version
+	read vendor release version < /etc/redhat-release 
 	if test $vendor = CentOS; then
 		nogroup='-n'
 	fi
@@ -49,13 +49,20 @@ else
     exit 1
 fi
 
+# test for x86_64 target
+if test -d /lib64; then
+    libdir=/lib64
+else
+    libdir=/lib
+fi
+    
 echo "Building directories"
 
 if ! /bin/mkdir -p -v -m 555		\
     "${jaildir}/bin"			\
     "${jaildir}/dev"			\
     "${jaildir}/etc/trust-anchors"	\
-    "${jaildir}/lib"			\
+    "${jaildir}/${libdir}"			\
     "${jaildir}/usr/lib"		\
     "${jaildir}/data"
 then
@@ -149,11 +156,11 @@ done
 
 # Under CentOS 5.5, rsync requires libresolv, but ldd doesn't show
 # it.
-if test -f /lib/libresolv.so.2; then
-    shared_libraries="${shared_libraries} /lib/libresolv.so.2"
+if test -f ${libdir}/libresolv.so.2; then
+    shared_libraries="${shared_libraries} ${libdir}/libresolv.so.2"
 fi
 
-for shared in /lib/ld*.so $shared_libraries /lib/libnss*.so.*
+for shared in ${libdir}/ld*.so $shared_libraries ${libdir}/libnss*.so.*
 do
     if test -r "${jaildir}/${shared}"
     then