merge to HEAD as of 2006-08-21

[bootmanager.git] / source / steps / UpdateNodeConfiguration.py

diff --git a/source/steps/UpdateNodeConfiguration.py b/source/steps/UpdateNodeConfiguration.py
index f7830e5..ec74bc2 100644 (file)
--- a/source/steps/UpdateNodeConfiguration.py
+++ b/source/steps/UpdateNodeConfiguration.py
@@ -1,6 +1,14 @@
+#!/usr/bin/python2 -u
+
+# Copyright (c) 2003 Intel Corporation
+# All rights reserved.
+#
+# Copyright (c) 2004-2006 The Trustees of Princeton University
+# All rights reserved.
+
+
 import os
 
-import InstallWriteConfig
 import InstallBuildVServer
 from Exceptions import *
 import utils
@@ -13,6 +21,9 @@ def Run( vars, log ):
     scripts based on what PLC has. Also, update any slivers on the machine
     incase their network files are out of date (primarily /etc/hosts).
 
+    Also write out /etc/planetlab/session, a random string that gets
+    a new value at every request of BootGetNodeDetails (ie, every boot)
+
     This step expects the root to be already mounted on SYSIMG_PATH.
     
     Except the following keys to be set:
@@ -57,11 +68,6 @@ def Run( vars, log ):
     if not ROOT_MOUNTED:
         raise BootManagerException, "Root isn't mounted on SYSIMG_PATH\n"
 
-
-    log.write( "Updating node network configuration\n" )
-    InstallWriteConfig.write_network_configuration( vars, log )
-
-
     log.write( "Updating vserver's /etc/hosts and /etc/resolv.conf files\n" )
 
     # create a list of the full directory paths of all the vserver images that
@@ -97,5 +103,5 @@ def Run( vars, log ):
     # the update flag is there
     for base_dir in update_path_list:
         InstallBuildVServer.update_vserver_network_files(base_dir,vars,log)
-        
+    
     return