diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2006-09-21 16:35:23 -0400 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2006-09-21 16:35:23 -0400 |
commit | ce22c5989fc2ca2574bf75bd9fbd626d41771f72 (patch) | |
tree | 3818d86fa383296262de3a64dca18e9c13bf46b8 /cobbler/action_check.py | |
parent | a846ccb34ab5723bc4ecef309575aae1c2532f51 (diff) | |
download | cobbler-ce22c5989fc2ca2574bf75bd9fbd626d41771f72.tar.gz cobbler-ce22c5989fc2ca2574bf75bd9fbd626d41771f72.tar.xz cobbler-ce22c5989fc2ca2574bf75bd9fbd626d41771f72.zip |
Naming cleanup of a few variables now that we're dealing with more
than pxelinux.0 (likely elilo.efi)
Diffstat (limited to 'cobbler/action_check.py')
-rw-r--r-- | cobbler/action_check.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cobbler/action_check.py b/cobbler/action_check.py index e0cfc125..235685cf 100644 --- a/cobbler/action_check.py +++ b/cobbler/action_check.py @@ -35,7 +35,7 @@ class BootCheck: status = [] self.check_name(status) self.check_dhcpd_bin(status) - self.check_pxelinux_bin(status) + self.check_bootloaders(status) self.check_tftpd_bin(status) self.check_tftpd_dir(status) self.check_tftpd_conf(status) @@ -67,14 +67,14 @@ class BootCheck: if not os.path.exists(self.settings.dhcpd_bin): status.append(cobbler_msg.lookup("no_dhcpd")) - def check_pxelinux_bin(self,status): + def check_bootloaders(self,status): """ - Check if pxelinux (part of syslinux) is installed + Check if network bootloaders are installed """ - for pxelinux in keys(self.settings.pxelinuxes): - filename = self.settings.pxelinuxes[pxelinux] + for loader in keys(self.settings.bootloaders): + filename = self.settings.bootloaders[loader] if not os.path.exists(filename): - status.append(cobbler_msg.lookup("no_pxelinux")) + status.append(cobbler_msg.lookup("no_bootloader")) return def check_tftpd_bin(self,status): @@ -137,7 +137,7 @@ class BootCheck: 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_line") % (self.settings.dhcpd_conf, 'filename "%s/pxelinux.0";' % self.settings.tftpboot)) + status.append(cobbler_msg.lookup("no_next_server") % (self.settings.dhcpd_conf)) else: status.append(cobbler_msg.lookup("no_exist") % self.settings.dhcpd_conf) |