From bf3eb91c27256ab38177e51c20a9cd3d1212cb10 Mon Sep 17 00:00:00 2001 From: zhongyehong Date: Sun, 10 Apr 2016 12:52:03 +0800 Subject: [PATCH] fix mismatching of nfs mountpoint #35 --- src/imagemgr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imagemgr.py b/src/imagemgr.py index 663f75d..b367279 100755 --- a/src/imagemgr.py +++ b/src/imagemgr.py @@ -67,7 +67,7 @@ class ImageMgr(): if os.path.exists(imgpath+image): return [False,"target image is exists"] 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.updateinfo(imgpath,image,description) logger.info("image:%s from LXC:%s create success" % (image,lxc)) @@ -83,7 +83,7 @@ class ImageMgr(): imgpath = self.imgpath + "private/" + user + "/" else: 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.updatetime(imgpath,image) return