From 066969c01269e66646fb3becef4a3eb6ba8fa016 Mon Sep 17 00:00:00 2001
From: zhong yehong <zhongyehong.pku@gmail.com>
Date: Tue, 21 Jun 2016 19:07:24 +0800
Subject: [PATCH] Revert "Revert "some modifications""

---
 src/imagemgr.py                  |  4 ++--
 web/templates/addCluster.html    | 10 +++-------
 web/templates/base_AdminLTE.html |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/imagemgr.py b/src/imagemgr.py
index c773b42..5c45fd9 100755
--- a/src/imagemgr.py
+++ b/src/imagemgr.py
@@ -133,7 +133,7 @@ class ImageMgr():
             sys_run("mount /dev/%s/%s %s" %(vgname,lxc,layer),True)
             #self.sys_call("mkdir -p %s/overlay %s/work" % (layer,layer))
             #self.sys_call("mount -t overlay overlay -olowerdir=%s/local/basefs,upperdir=%s/overlay,workdir=%s/work %s" % (self.NFS_PREFIX,layer,layer,rootfs))
-            sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh none %s/" % (layer,self.NFS_PREFIX,rootfs),True)
+            sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh -o udba=reval none %s/" % (layer,self.NFS_PREFIX,rootfs),True)
             sys_run("mkdir -p %s/local/temp/%s" % (self.NFS_PREFIX,lxc))
 
         except Exception as e:
@@ -178,7 +178,7 @@ class ImageMgr():
             sys_run("mount /dev/%s/%s %s" % (vgname,lxc,layer))
         Ret = sys_run("mountpoint %s" % rootfs)
         if Ret.returncode != 0:
-            sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh none %s/" % (layer,self.NFS_PREFIX,rootfs))
+            sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh -o udba=reval none %s/" % (layer,self.NFS_PREFIX,rootfs))
         return True
 
 
diff --git a/web/templates/addCluster.html b/web/templates/addCluster.html
index aa68c99..0d84813 100644
--- a/web/templates/addCluster.html
+++ b/web/templates/addCluster.html
@@ -37,14 +37,11 @@
                         <div class="box-body">
                             <form id="form" class="form-horizontal" action="/workspace/add/" method="POST">
 
-				    <div class="row">
 				    <div class="form-group"><label class="col-sm-2 control-label">Workspace Name</label>
 					    <div class="col-sm-10"><input type="text" class="form-control" name="clusterName" id="clusterName"></div>
 				    </div>
-				    </div>
 				    <div class="hr-line-dashed"></div>
                     <br/>
-				    <div class="row">
 				    <div class="form-group"><label class="col-sm-2 control-label">Image Choose</label>
 					    <div class="col-sm-10">
 					    	<table class="table table-striped table-bordered table-hover table-image" >
@@ -86,10 +83,9 @@
 							{% endfor %}
 						    {% endfor %}
 						    </tbody>
-					    </table>
-					</div>
-                                    </div>
-				    </div>
+					        </table>
+					    </div>
+                    </div>
 
 				    <div class="hr-line-dashed"></div>
                     <br/>
diff --git a/web/templates/base_AdminLTE.html b/web/templates/base_AdminLTE.html
index 3184a7b..d1666be 100644
--- a/web/templates/base_AdminLTE.html
+++ b/web/templates/base_AdminLTE.html
@@ -163,7 +163,7 @@
             <a href='/notification/'><i class="fa fa-envelope"></i> <span class="nav-label">Notifications</span></a>
         </li>
         <li id="admin">
-            <a href='/admin/'><i class="fa fa-gears"></i> <span class="nav-label">Admin</span></a>
+            <a href='/admin/'><i class="fa fa-user"></i> <span class="nav-label">Admin</span></a>
         </li>
   {% endif %}