Changeset 168 for trunk

Timestamp:

08/19/09 09:51:32 (14 years ago)

Author:

bas

Message:

Added a common module for daemon and client:

• src/pxe_global.py.in

src/pxeconfig.py:

• removed some statements that are moved to pxe_global.py.in

Location:

trunk/src

Files:

• pxe_global.py.in (added)
• pxeconfig.py (moved) (moved from trunk/src/pxeconfig.py.in) (6 diffs)

trunk/src/pxeconfig.py

@@ -58 +58 @@
 import getopt
 import socket
-import ConfigParser
+#import ConfigParser
 import re
 
 # import from the sara_python_modules
 import AdvancedParser
-import pxe_global
+from pxe_global import *
 
 # Constants
@@ -226 +226 @@
                 cnet = string.joinfields(net[0:3], '.')
 
+                if options.SCRIPT_HOOK:
+                        if options.DEBUG or options.DRY_RUN or options.VERBOSE:
+                                print 'Executing client script hook: %s with arg: %s' %(options.SCRIPT_HOOK, addr)
+                        if not options.DRY_RUN:
+                                cmd = '%s %s' %(options.SCRIPT_HOOK, addr)
+
                 haddr = '%s%02X' %(net_2_hex(cnet, options), int(net[3])) 
-
                 manage_links(haddr, options)
-                
 
 def add_options(p):
@@ -241 +245 @@
                 REMOVE  = False,
                 VERSION  = False,
+                SCRIPT_HOOK = False,
         )
 
@@ -305 +310 @@
                         pass
 
+        # Only check if we have specified an pxeconfig file if we did not
+        # specify the REMOVE option
+        #
         if not options.REMOVE:
                 if options.filename:
@@ -313 +321 @@
                         options.filename = select_pxe_configfile() 
 
+        # ...
+        if settings['client_script_hook']:
+                options.SCRIPT_HOOK = settings['client_script_hook']
+
         if options.DEBUG:
                 print args, options
@@ -323 +335 @@
         #
         global PXE_CONF_DIR
-        
-        configfile = '@pxeconfig_conf@'
-        settings = ReadConfig(configfile) 
+        settings = ReadConfig() 
         
         try: