From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Thu, 1 Mar 2007 20:29:00 +0000 (+0000)
Subject: * merge from head.  David's fix for "Write slice name to /etc/slicename." bump rev.
X-Git-Tag: planetlab-4_0-rc2~11
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=6580012031617d938cde58698b401f864da3199f

* merge from head.  David's fix for "Write slice name to /etc/slicename." bump rev.
---

diff --git a/NodeManager.spec b/NodeManager.spec
index 2497c71..91a4a71 100644
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -1,7 +1,7 @@
 Summary: PlanetLab Node Manager
 Name: NodeManager
 Version: 1.2
-Release: 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+Release: 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 License: PlanetLab
 Group: System Environment/Daemons
 URL: http://cvs.planet-lab.org/cvs/NodeManager
diff --git a/sliver_vs.py b/sliver_vs.py
index e2e77f8..adbebd0 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -58,6 +58,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
         else:
             logger.log_call('/usr/sbin/vuseradd', name)
+        open('/vservers/%s/etc/slicename' % name, 'w').write(name)
 
     @staticmethod
     def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)