X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvserver_tools.py;h=be6e1c015e4ea110331784f40735f7288cf3373e;hb=565081bd9f3c39d65156469fff72cc2408b71fdf;hp=4918d339d1403300adc9e5545e741515ecffda64;hpb=d1fe483c9e4d4f70572cad3c53e4ebcb57304b12;p=infrastructure.git

diff --git a/scripts/vserver_tools.py b/scripts/vserver_tools.py
index 4918d33..be6e1c0 100755
--- a/scripts/vserver_tools.py
+++ b/scripts/vserver_tools.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
 
 import sys
 import os.path
@@ -343,27 +341,36 @@ class Vserver:
         result=True
         if currently_running:
             result = result and self.stop()
-        result = result \
-            and e2b(ssh.run("mv /vservers/%(oldname)s /vservers/%(newname)s"%locals(),
-                            message="tweaking /vservers/<>")) \
-            and e2b(ssh.run("mv /etc/vservers/%(oldname)s /etc/vservers/%(newname)s"%locals(),
-                            message="tweaking /etc/vservers/<>")) \
-            and e2b(ssh.run("rm /etc/vservers/%(newname)s/run"%locals(),
-                            message="cleaning /etc/vservers/<>/run")) \
-            and e2b(ssh.run("ln -s /var/run/vservers/%(newname)s /etc/vservers/%(newname)s/run"%locals(),
-                            message="adjusting /etc/vservers/<>/run")) \
-            and e2b(ssh.run("rm /etc/vservers/%(newname)s/vdir"%locals(),
-                            message="cleaning /etc/vservers/<>/vdir")) \
-            and e2b(ssh.run("ln -s /etc/vservers/.defaults/vdirbase/%(newname)s /etc/vservers/%(newname)s/vdir"%locals(),
-                            message="adjusting /etc/vservers/<>/vdir")) \
-            and e2b(ssh.run("rm /etc/vservers/%(newname)s/cache"%locals(),
-                            message="cleaning /etc/vservers/<>/cache")) \
-            and e2b(ssh.run("ln -s /etc/vservers/.defaults/cachebase/%(newname)s /etc/vservers/%(newname)s/cache"%locals(),
-                            message="adjusting /etc/vservers/<>/cache")) \
-            and e2b(ssh.run("rm /var/run/vservers.rev/%(xid)s"%locals(),
-                            message="cleaning /var/run/vservers.rev/<>")) \
-            and e2b(ssh.run("ln -s /etc/vserver/%(newname)s /var/run/vservers.rev/%(xid)s"%locals(),
-                            message="adjusting /var/run/vservers.rev/<>")) 
+        result = result and e2b(ssh.run("mv /vservers/%(oldname)s /vservers/%(newname)s"%locals(),
+                                        message="tweaking /vservers/<>"))
+        result = result and e2b(ssh.run("mv /etc/vservers/%(oldname)s /etc/vservers/%(newname)s"%locals(),
+                                        message="tweaking /etc/vservers/<>")) 
+        result = result and e2b(ssh.run("mv /vservers/.pkg/%(oldname)s /vservers/.pkg/%(newname)s"%locals(),
+                                        message="renaming /vservers/.pkg/<>")) 
+        result = result and e2b(ssh.run("rm /etc/vservers/%(newname)s/run"%locals(),
+                                        message="cleaning /etc/vservers/<>/run")) 
+        result = result and e2b(ssh.run("ln -s /var/run/vservers/%(newname)s /etc/vservers/%(newname)s/run"%locals(),
+                                        message="adjusting /etc/vservers/<>/run")) 
+        result = result and e2b(ssh.run("rm /etc/vservers/%(newname)s/vdir"%locals(),
+                                        message="cleaning /etc/vservers/<>/vdir")) 
+        result = result and e2b(ssh.run("ln -s /etc/vservers/.defaults/vdirbase/%(newname)s /etc/vservers/%(newname)s/vdir"%locals(),
+                                        message="adjusting /etc/vservers/<>/vdir")) 
+        result = result and e2b(ssh.run("rm /etc/vservers/%(newname)s/cache"%locals(),
+                                        message="cleaning /etc/vservers/<>/cache")) 
+        result = result and e2b(ssh.run("ln -s /etc/vservers/.defaults/cachebase/%(newname)s /etc/vservers/%(newname)s/cache"%locals(),
+                                        message="adjusting /etc/vservers/<>/cache")) 
+        result = result and e2b(ssh.run("rm /var/run/vservers.rev/%(xid)s"%locals(),
+                                        message="cleaning /var/run/vservers.rev/<>")) 
+        result = result and e2b(ssh.run("ln -s /etc/vservers/%(newname)s /var/run/vservers.rev/%(xid)s"%locals(),
+                                        message="adjusting /var/run/vservers.rev/<>")) 
+        result = result and e2b(ssh.run("sed -i -e s,%(oldname)s,%(newname)s,g /etc/vservers/%(newname)s/name"%locals(),
+                                        message="adjusting /etc/vservers/<>/name"))
+        result = result and e2b(ssh.run("sed -i -e s,%(oldname)s,%(newname)s,g /etc/vservers/%(newname)s/uts/nodename"%locals(),
+                                        message="adjusting /etc/vservers/<>/uts/nodename"))
+        # ignore rsult
+        e2b(ssh.run("sed -i -e s,\\[%(oldname)s\\],\\[%(newname)s\\], /vservers/%(newname)s/root/.profile"%locals(),
+                                        message="adjusting /vservers/<>/root/.profile"))
+
 #        # refreshing target instance
         target=Vserver(newname,dry_run=self.dry_run,verbose=self.verbose)
         target.set_hostname(self.hostname)