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

-defect 2979119 is fixed;

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5626 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2010-03-31 12:35:45 +00:00
parent 7d2c904eb8
commit 688cfffe51
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,35 +221,26 @@ sub process_request {
if($entry[1] eq $oldentry[1]) {
#$callback->({info => ["$f is not changed..."]});
} else {
# have to consider both genimage and liteimg re-run
$callback->({info => ["! $f may be removed or changed..."]});
#TODO: recover the file back
if ($oldentry[1] =~ m/bind/) {
# shouldn't copy back from /.default, maybe the user has replaced the file/directory in .postinstall file
my $default = $rootimg_dir."/.default".$f;
#my $target = $rootimg_dir.$f;
#if (-d $target) {
# xCAT::Utils->runcmd("cp -a $default* $target",0, 1);
#}else {
# xCAT::Utils->runcmd("cp -a $default $target",0, 1);
#}
my $default = $rootimg_dir . "/.default" . $f;
xCAT::Utils->runcmd("rm -rf $default", 0, 1); # not sure whether it's necessary right now
} else {
my $target = $rootimg_dir.$f;
if (-l $target) {
xCAT::Utils->runcmd("rm -rf $target", 0, 1);
my $location = readlink $target;
# if it is not linked from tmpfs, it should be modified by the .postinstall file
if ($location =~ /\.statelite\/tmpfs/) {
xCAT::Utils->runcmd("rm -rf $target", 0, 1);
my $default = $rootimg_dir . "/.default" . $f;
xCAT::Utils->runcmd("cp -a $default $target", 0, 1);
}
}
$target = $rootimg_dir . "/.statelite/tmpfs" . $f;
xCAT::Utils->runcmd("rm -rf $target", 0, 1);
my $default = $rootimg_dir . "/.default".$f;
$target = $rootimg_dir . $f;
if ( ! -e $target ) {
xCAT::Utils->runcmd("cp -a $default $target",0, 1);
}
xCAT::Utils->runcmd("rm -rf $default", 0, 1);
}
}
}