1 files changed, 66 insertions, 2 deletions

diff --git a/cobbler/utils.py b/cobbler/utils.py
index 069d440..4d2b635 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -230,6 +230,22 @@ def find_kickstart(url):
            return url
     return None
 
+def input_string_or_list(options,delim=","):
+    """
+    Accepts a delimited list of stuff or a list, but always returns a list.
+    """
+    if options is None or options == "delete":
+       return []
+    elif type(options) == list:
+       return options
+    elif type(options) == str:
+       tokens = options.split(delim)
+       if delim == ",":
+           tokens = [t.lstrip().rstrip() for t in tokens]
+       return tokens
+    else:
+       raise CX(_("invalid input type"))
+
 def input_string_or_hash(options,delim=","):
     """
     Older cobbler files stored configurations in a flat way, such that all values for strings.
@@ -240,7 +256,7 @@ def input_string_or_hash(options,delim=","):
     if options == "<<inherit>>":
         options = {}
 
-    if options is None:
+    if options is None or options == "delete":
         return (True, {})
     elif type(options) == list:
         raise CX(_("No idea what to do with list: %s") % options)
@@ -261,7 +277,7 @@ def input_string_or_hash(options,delim=","):
         options.pop('',None)
         return (True, options)
     else:
-        raise CX(_("Foreign options type"))
+        raise CX(_("invalid input type"))
 
 def grab_tree(api_handle, obj):
     """
@@ -468,3 +484,51 @@ def fix_mod_python_select_submission(repos):
     repos = repos.lstrip().rstrip()
     return repos
 
+def redhat_release():
+    if not os.path.exists("/bin/rpm"):
+       return ("unknown", 0)
+    args = ["/bin/rpm", "-q", "--whatprovides", "redhat-release"]
+    cmd = sub_process.Popen(args,shell=False,stdout=sub_process.PIPE)
+    data = cmd.communicate()[0]
+    data = data.rstrip().lower()
+    make = "other"
+    if data.find("redhat") != -1:
+        make = "redhat"
+    elif data.find("centos") != -1:
+        make = "centos"
+    elif data.find("fedora") != -1:
+        make = "fedora"
+    version = data.split("release-")[-1]
+    rest = 0
+    if version.find("-"):
+       parts = version.split("-")
+       version = parts[0]
+       rest = parts[1]
+    return (make, float(version), rest)
+
+def tftpboot_location():
+
+    # if possible, read from TFTP config file to get the location
+    if os.path.exists("/etc/xinetd.d/tftp"):
+        fd = open("/etc/xinetd.d/tftp")
+        lines = fd.read().split("\n")
+        for line in lines:
+           if line.find("server_args") != -1:
+              tokens = line.split(None)
+              mark = False
+              for t in tokens:
+                 if t == "-s":    
+                    mark = True
+                 elif mark:
+                    return t
+
+    # otherwise, guess based on the distro
+    (make,version,rest) = redhat_release()
+    if make == "fedora" and version >= 9:
+       return "/var/lib/tftpboot"
+    return "/tftpboot"
+
+if __name__ == "__main__":
+    # print redhat_release()
+    print tftpboot_location()
+