Changeset 206 for trunk/src

Timestamp:

12/18/12 12:53:42 (11 years ago)

Author:

bas

Message:

added a new option to skip hostname lookup failures

Location:

trunk/src

Files:

• pxeconfig.py (modified) (5 diffs)
• pxeconfigd.py (modified) (2 diffs)

trunk/src/pxeconfig.py

@@ -74 +74 @@
 START        = 'start'
 END          = 'end'
-VERSION      = '3.1.0'
+VERSION      = '4.2.0'
 
 def select_pxe_configfile():
@@ -233 +233 @@
         SCRIPT_HOOK_ADD = False,
         SCRIPT_HOOK_REMOVE = False,
+        SKIP_HOSTNAME_ERRORS = False,
     )
 
@@ -263 +264 @@
         dest   = 'VERBOSE',
         help   = 'Make the program more verbose (default: False)'
+    )
+
+    p.add_option('-H', '--skip-hostname-lookup-error',
+        action = 'store_true',
+        dest   = 'SKIP_HOSTNAME_LOOKUP_ERROR',
+        help   = 'When hostname lookup fails, skip it (default: False)'
     )
 
@@ -309 +316 @@
 
 
+    if not options.SKIP_HOSTNAME_LOOKUP_ERROR:
+        try:
+            options.SKIP_HOSTNAME_LOOKUP_ERROR = defaults['skip_hostname_lookup_error']
+        except KeyError, detail:
+            pass
+
     ## This will be obsoleted by client_script_hook_add
     #
@@ -343 +356 @@
             mac_2_hex(host, options)
         else:
-            host_2_hex(host, options)
+            try:
+                host_2_hex(host, options)
+            except PxeConfig, detail:
+
+                if options.SKIP_HOSTNAME_LOOKUP_ERROR:
+                    print 'Skipping Hostname lookup failed for: %s' %(host)
+                    continue
+                else:
+                    print detail
+                    sys.exit(1)
 
 def main():

trunk/src/pxeconfigd.py

@@ -26 +26 @@
         config file which tells how the node must boot. This daemon
         enables a client to remove his/here pxe config file. With the
-        next boot it will use the default one.
-
-        command line option:
-          -V/--version 
-            Prints the version number and exits
+        next boot it will use the default one.
+
+        command line option:
+          -V/--version 
+            Prints the version number and exits
           
         Note:
-          This server can ONLY be started from inetd.
+          This server can ONLY be started from inetd/xinetd.
 """
 import time
@@ -59 +59 @@
 
 PXE_CONF_DIR = '/tftpboot/pxelinux.cfg'
-VERSION = '3.1.0'
+VERSION = '4.2.0'
 
 # Give the current time