From 05ce8e2065c52bff0229d9f1dd1fa758d80e0960 Mon Sep 17 00:00:00 2001 From: vallard Date: Wed, 4 Mar 2009 05:52:36 +0000 Subject: [PATCH] added support for homogenious systems, no arch required in torque install git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2833 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../xcat/netboot/add-on/torque/add_torque | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/add-on/torque/add_torque b/xCAT-server/share/xcat/netboot/add-on/torque/add_torque index 5295c4f5f..b32c334e5 100755 --- a/xCAT-server/share/xcat/netboot/add-on/torque/add_torque +++ b/xCAT-server/share/xcat/netboot/add-on/torque/add_torque @@ -42,28 +42,34 @@ fi if [ "$LOCALNFS" = "local" ] then - if [ ! -d "$TPRE/$TARCH/bin" ] + if [ -d "$TPRE/$TARCH"] then - echo "${MYNAME}: cannot read $TPRE/$TARCH/bin" >&2 + RTPRE="$TPRE/$TARCH" + else + RTPRE="$TPRE" + fi + if [ ! -d "$RTPRE/bin" ] + then + echo "${MYNAME}: cannot read $RTPRE/bin" >&2 exit 1 fi - if [ ! -d "$TPRE/$TARCH/lib" ] + if [ ! -d "$RTPRE/lib" ] then - echo "${MYNAME}: cannot read $TPRE/$TARCH/lib" >&2 + echo "${MYNAME}: cannot read $RTPRE/lib" >&2 exit 1 fi - if [ ! -d "$TPRE/$TARCH/sbin" ] + if [ ! -d "$RTPRE/sbin" ] then - echo "${MYNAME}: cannot read $TPRE/$TARCH/sbin" >&2 + echo "${MYNAME}: cannot read $RTPRE/sbin" >&2 exit 1 fi - find $TPRE/$TARCH -print | cpio -v -dump $ROOTDIR + find $RTPRE -print | cpio -v -dump $ROOTDIR - echo "$TPRE/$TARCH/lib" >$ROOTDIR/etc/ld.so.conf.d/torque.conf + echo "$RTPRE/lib" >$ROOTDIR/etc/ld.so.conf.d/torque.conf chroot $ROOTDIR /sbin/ldconfig else - echo "$TPRE/$TARCH/lib" >$ROOTDIR/etc/ld.so.conf.d/torque.conf + echo "$RTPRE/lib" >$ROOTDIR/etc/ld.so.conf.d/torque.conf fi cd $ROOTDIR