arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 3370678:fix the problem that statelite could not handle the link,persistent option correctly

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10144 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2011-07-23 04:36:47 +00:00
parent 9118c12feb
commit c444f232b8
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
View File

@ -292,10 +292,6 @@ ProcessType () {
PATH=`echo ${PATH} | /bin/sed -e 's/\/$//'`
TARGET=${TMPFS}${PATH}
if [ -d ${TARGET} ]; then
echo "rm -Rf ${TARGET}" >>$LOG 2>&1
/bin/rm -Rf ${TARGET} 2>&1 >>$LOG
fi
if [ ! -d ${PERSISTENT}${PPATH} ]; then
/bin/mkdir -p ${PERSISTENT}${PPATH} 2>&1 >>$LOG
@ -309,22 +305,31 @@ ProcessType () {
fi
if [ "$isChild" = "1" ]; then
num=${#PLIST[@]}
pnum=${#PLIST[@]}
echo "${PPATH}: "
for ((i=0;i<$num; i++)); do
set -- ${PLIST[$i]}
parent="$PPATH/"
while [ "$parent" != "//" ]; do
for ((p=0;p<$pnum; p++)); do
set -- ${PLIST[$p]}
itype=$1
ipath=$2
if [ "$PPATH" = "$ipath" ]; then
if [ "$parent" = "$ipath" ]; then
echo "${itype}"
if [ "$itype" = "link,persistent" ]; then
#if [ "$itype" = "link,persistent" ]; then
if [ "$itype" = "link" -o "$itype" = "tmpfs,rw" ]; then
# mount it to ${TARGET}
echo "mount --bind ${PERSISTENT}${PATH} ${TARGET}" >>$LOG 2>&1
/bin/mount --bind ${PERSISTENT}${PATH} ${TARGET}
fi
fi
done
parent="`/usr/bin/dirname $parent`/"
done
else
if [ -d ${TARGET} ]; then
echo "rm -Rf ${TARGET}" >>$LOG 2>&1
/bin/rm -Rf ${TARGET} 2>&1 >>$LOG
fi
# finally make the tmpfs link point to the persistent file
# you have to get rid of the ${MNTDIR} directory in the beginning
# so that when the chroot happens the link is valid.

23
xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite.ppc.redhat
View File

@ -292,10 +292,6 @@ ProcessType () {
PATH=`echo ${PATH} | /bin/sed -e 's/\/$//'`
TARGET=${TMPFS}${PATH}
if [ -d ${TARGET} ]; then
echo "rm -Rf ${TARGET}" >>$LOG 2>&1
/bin/rm -Rf ${TARGET} 2>&1 >>$LOG
fi
if [ ! -d ${PERSISTENT}${PPATH} ]; then
/bin/mkdir -p ${PERSISTENT}${PPATH} 2>&1 >>$LOG
@ -309,22 +305,31 @@ ProcessType () {
fi
if [ "$isChild" = "1" ]; then
num=${#PLIST[@]}
pnum=${#PLIST[@]}
echo "${PPATH}: "
for ((i=0;i<$num; i++)); do
set -- ${PLIST[$i]}
parent="$PPATH/"
while [ "$parent" != "//" ]; do
for ((p=0;p<$pnum; p++)); do
set -- ${PLIST[$p]}
itype=$1
ipath=$2
if [ "$PPATH" = "$ipath" ]; then
if [ "$parent" = "$ipath" ]; then
echo "${itype}"
if [ "$itype" = "link,persistent" ]; then
#if [ "$itype" = "link,persistent" ]; then
if [ "$itype" = "link" -o "$itype" = "tmpfs,rw" ]; then
# mount it to ${TARGET}
echo "mount --bind ${PERSISTENT}${PATH} ${TARGET}" >>$LOG 2>&1
/bin/mount --bind ${PERSISTENT}${PATH} ${TARGET}
fi
fi
done
parent="`/usr/bin/dirname $parent`/"
done
else
if [ -d ${TARGET} ]; then
echo "rm -Rf ${TARGET}" >>$LOG 2>&1
/bin/rm -Rf ${TARGET} 2>&1 >>$LOG
fi
# finally make the tmpfs link point to the persistent file
# you have to get rid of the ${MNTDIR} directory in the beginning
# so that when the chroot happens the link is valid.