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

for defect 3168785, add code for statelite comptiable reason.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8917 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2011-02-24 08:04:45 +00:00
parent ad652bc828
commit 7b9fa084c0
4 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/xcat/plugins/litetree.pm
View File

@ -382,7 +382,8 @@ sub mergeArrays {
if (xCAT::Utils->isAIX()) {
$o = "rw"; # default option if not provided
} else {
$o = "tmpfs";
# for compatible reason, the default option is set to "tmpfs,rw"
$o = "tmpfs,rw";
}
}
@ -391,7 +392,7 @@ sub mergeArrays {
# TODO
# let the user know the "link" option should be with
# /etc/mtab
$o = "link";
$o = "tmpfs,rw";
}
# TODO: put some logic in here to make sure that ro is alone.

4
xCAT-server/lib/xcat/plugins/statelite.pm
View File

@ -243,6 +243,10 @@ sub process_request {
}
my $listNew = $synclist[0];
# for compatible reason, replace "tmpfs,rw" with "link" option in xCAT 2.5 or higher
for (@{$listNew}) {
s/tmpfs,rw/link/;
}
# the directory/file in litefile table must be the absolute path ("/***")
foreach my $entry (@$listNew) {

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

@ -242,16 +242,26 @@ ProcessType () {
fi
case "${3}" in
link) # the previous name is tmpfs,rw
link) # the previous name is tmpfs,rw
if [ -d ${TMPFS}${2} ]; then
/bin/cp -r -a ${1}* ${TMPFS}${2}
echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
/bin/cp -r -a ${1}* ${TMPFS}${2}
echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
else
/bin/cp -r -a ${1} ${TMPFS}${2}
echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
fi
# the link has already be in place on the image, so nothing else to do!
;;
# the link has already be in place on the image, so nothing else to do!
;;
tmpfs,rw) # which has the same meaning of "link", it exists for compatible reason
if [ -d ${TMPFS}${2} ]; then
/bin/cp -r -a ${1}* ${TMPFS}${2}
echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
else
/bin/cp -r -a ${1} ${TMPFS}${2}
echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
fi
# the link has already be in place on the image, so nothing else to do!
;;
link,ro)
# need to make sure its parent directory exists:
if [ ! -d ${TMPFS}${PPATH} ]; then

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

@ -242,16 +242,26 @@ ProcessType () {
fi
case "${3}" in
link) # the previous name is tmpfs,rw
link) # the previous name is tmpfs,rw
if [ -d ${TMPFS}${2} ]; then
/bin/cp -r -a ${1}* ${TMPFS}${2}
echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
/bin/cp -r -a ${1}* ${TMPFS}${2}
echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
else
/bin/cp -r -a ${1} ${TMPFS}${2}
echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
fi
# the link has already be in place on the image, so nothing else to do!
;;
# the link has already be in place on the image, so nothing else to do!
;;
tmpfs,rw) # which has the same meaning of "link". It exists for compatible reason
if [ -d ${TMPFS}${2} ]; then
/bin/cp -r -a ${1}* ${TMPFS}${2}
echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
else
/bin/cp -r -a ${1} ${TMPFS}${2}
echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
fi
# the link has already be in place on the image, so nothing else to do!
;;
link,ro)
# need to make sure its parent directory exists:
if [ ! -d ${TMPFS}${PPATH} ]; then