m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mismatching of nfs mountpoint #35

This commit is contained in:
zhongyehong 2016-04-10 12:52:03 +08:00
parent 4b8fc51a57
commit bf3eb91c27
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/imagemgr.py
View File

@ -67,7 +67,7 @@ class ImageMgr():
if os.path.exists(imgpath+image): if os.path.exists(imgpath+image):
return [False,"target image is exists"] return [False,"target image is exists"]
self.sys_call("mkdir -p %s" % imgpath+image) self.sys_call("mkdir -p %s" % imgpath+image)
self.sys_call("rsync -a --delete --exclude=lost+found/ --exclude=nfs/ --exclude=dev/ --exclude=mnt/ --exclude=tmp/ --exclude=media/ --exclude=proc/ --exclude=sys/ %s/ %s/" % (self.dealpath(fspath),imgpath+image)) self.sys_call("rsync -a --delete --exclude=lost+found/ --exclude=root/nfs/ --exclude=dev/ --exclude=mnt/ --exclude=tmp/ --exclude=media/ --exclude=proc/ --exclude=sys/ %s/ %s/" % (self.dealpath(fspath),imgpath+image))
self.sys_call("rm -f %s" % (imgpath+"."+image+"_docklet_share")) self.sys_call("rm -f %s" % (imgpath+"."+image+"_docklet_share"))
self.updateinfo(imgpath,image,description) self.updateinfo(imgpath,image,description)
logger.info("image:%s from LXC:%s create success" % (image,lxc)) logger.info("image:%s from LXC:%s create success" % (image,lxc))
@ -83,7 +83,7 @@ class ImageMgr():
imgpath = self.imgpath + "private/" + user + "/" imgpath = self.imgpath + "private/" + user + "/"
else: else:
imgpath = self.imgpath + "public/" + imageowner + "/" imgpath = self.imgpath + "public/" + imageowner + "/"
self.sys_call("rsync -a --delete --exclude=lost+found/ --exclude=nfs/ --exclude=dev/ --exclude=mnt/ --exclude=tmp/ --exclude=media/ --exclude=proc/ --exclude=sys/ %s/ %s/" % (imgpath+imagename,self.dealpath(fspath))) self.sys_call("rsync -a --delete --exclude=lost+found/ --exclude=root/nfs/ --exclude=dev/ --exclude=mnt/ --exclude=tmp/ --exclude=media/ --exclude=proc/ --exclude=sys/ %s/ %s/" % (imgpath+imagename,self.dealpath(fspath)))
#self.sys_call("rsync -a --delete --exclude=nfs/ %s/ %s/" % (imgpath+image,self.dealpath(fspath))) #self.sys_call("rsync -a --delete --exclude=nfs/ %s/ %s/" % (imgpath+image,self.dealpath(fspath)))
#self.updatetime(imgpath,image) #self.updatetime(imgpath,image)
return return