File cobbler-check-and-get-loaders-fix.patch of Package cobbler

Overview Repositories Revisions Requests Users Attributes Meta

File cobbler-check-and-get-loaders-fix.patch of Package cobbler

--- cobbler/action_check.py	2016-05-13 14:40:47.960248536 +0100
+++ cobbler/action_check.py	2016-05-16 08:53:07.159770505 +0100
@@ -22,6 +22,7 @@
 """
 
 import os
+import sys
 import re
 import action_sync
 import utils
@@ -84,9 +85,10 @@
 
        self.check_service(status, "cobblerd")
 
-       self.check_bootloaders(status)
+       if sys.arch == "ppc64le":
+          self.check_bootloaders(status)
+
        self.check_for_wget_curl(status)
-       self.check_rsync_conf(status)
        self.check_httpd(status)
        self.check_iptables(status)
        self.check_yum(status)
@@ -268,11 +268,11 @@
            "red hat enterprise linux server",
            "fedora",
            "centos",
-           "scientific linux"
+           "scientific linux",
+           "suse",
+           "opensuse"
        ):
            rc = utils.subprocess_get(self.logger,"httpd -v")
-       elif self.checked_dist == "suse" or self.checked_dist == "opensuse":
-           rc = utils.subprocess_get(self.logger,"httpd2 -v")
        else:
            rc = utils.subprocess_get(self.logger,"apache2 -v")
        if rc.find("Server") == -1:
@@ -348,7 +351,7 @@
              not_found.append(loader_name)
 
        if len(not_found) > 0:
-          status.append("some network boot-loaders are missing from /var/lib/cobbler/loaders, you may run 'cobbler get-loaders' to download them, or, if you only want to handle x86/x86_64 netbooting, you may ensure that you have installed a *recent* version of the syslinux package installed and can ignore this message entirely.  Files in this directory, should you want to support all architectures, should include pxelinux.0, menu.c32, elilo.efi, and yaboot. The 'cobbler get-loaders' command is the easiest way to resolve these requirements.")
+          status.append("some network boot-loaders are missing from /var/lib/cobbler/loaders, if you only want to handle x86/x86_64 netbooting, you may ensure that you have installed a *recent* version of the syslinux package installed and can ignore this message entirely.  Files in this directory, should you want to support all architectures, should include pxelinux.0, menu.c32, elilo.efi, and yaboot. You can get the loaders from your SUSE DVDs.")
 
    def check_tftpd_bin(self,status):
        """
--- cobbler/cli.py	2016-05-13 14:40:44.404233147 +0100
+++ cobbler/cli.py	2016-05-13 14:42:28.196682027 +0100
@@ -498,9 +498,7 @@
             (options, args) = self.parser.parse_args()
             task_id = self.start_task("validateks",options)
         elif action_name == "get-loaders":
-            self.parser.add_option("--force", dest="force", action="store_true", help="overwrite any existing content in /var/lib/cobbler/loaders")
-            (options, args) = self.parser.parse_args()
-            task_id = self.start_task("dlcontent",options)
+            print "Command 'get-loaders' is not supported in this version of cobbler"
         elif action_name == "import":
             self.parser.add_option("--arch",         dest="arch",           help="OS architecture being imported")
             self.parser.add_option("--breed",        dest="breed",          help="the breed being imported")

Places

File cobbler-check-and-get-loaders-fix.patch of Package cobbler

Places