diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-04-27 10:18:27 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-04-27 10:18:27 -0400 |
| commit | 98a5cfbf1cb674d5fb92112a0bebfd0e2313a913 (patch) | |
| tree | a4ee86d560c09f8e02a3c71cd403130d587cbb7e /cobbler | |
| parent | e28fc906e89f31e05a08598a307e1a32d139938b (diff) | |
| download | third_party-cobbler-98a5cfbf1cb674d5fb92112a0bebfd0e2313a913.tar.gz third_party-cobbler-98a5cfbf1cb674d5fb92112a0bebfd0e2313a913.tar.xz third_party-cobbler-98a5cfbf1cb674d5fb92112a0bebfd0e2313a913.zip | |
Fix warning message for "cobbler check" and malformed /etc/dhcpd.conf
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_check.py | 4 | ||||
| -rw-r--r-- | cobbler/cobbler_msg.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cobbler/action_check.py b/cobbler/action_check.py index 5ba95bf..f35b2a5 100644 --- a/cobbler/action_check.py +++ b/cobbler/action_check.py @@ -139,9 +139,9 @@ class BootCheck: if line.find("filename") != -1: match_file = True if not match_next: - status.append(cobbler_msg.lookup("no_line") % (self.settings.dhcpd_conf, 'next-server ip-address')) - if not match_file: status.append(cobbler_msg.lookup("no_next_server") % (self.settings.dhcpd_conf)) + if not match_file: + status.append(cobbler_msg.lookup("no_filename") % (self.settings.dhcpd_conf)) else: status.append(cobbler_msg.lookup("no_exist") % self.settings.dhcpd_conf) diff --git a/cobbler/cobbler_msg.py b/cobbler/cobbler_msg.py index ad3d601..121d70e 100644 --- a/cobbler/cobbler_msg.py +++ b/cobbler/cobbler_msg.py @@ -85,8 +85,8 @@ _msg_table = { "chg_attrib" : "need to change field '%s' value to '%s' in file '%s'", "no_exist" : "file %s does not exist", "no_exist2" : "path %s does not exist", - "no_line" : "file '%s' should have a line '%s' somewhere", "no_next_server" : "file '%s' should have a next-server line", + "no_filename" : "file '%s' should have a filename line", "no_dir2" : "can't find %s for %s as referenced in /var/lib/cobbler/settings", "bad_param" : "at least one parameter is missing for this function", "empty_list" : "There are no configured %s records.", |