diff options
Diffstat (limited to 'cobbler')
-rw-r--r-- | cobbler/action_sync.py | 2 | ||||
-rw-r--r-- | cobbler/item_system.py | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index fa2f0a4..f8e9ed2 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -636,7 +636,7 @@ class BootSync: if kickstart_path is not None and kickstart_path != "": if system is not None and kickstart_path.startswith("/"): - pxe_fn = self.utils_config_filename(system) + pxe_fn = utils.get_config_filename(system) kickstart_path = "http://%s/cblr/kickstarts_sys/%s/ks.cfg" % (self.settings.server, pxe_fn) elif kickstart_path.startswith("/") or kickstart_path.find("/cobbler/kickstarts/") != -1: kickstart_path = "http://%s/cblr/kickstarts/%s/ks.cfg" % (self.settings.server, profile.name) diff --git a/cobbler/item_system.py b/cobbler/item_system.py index ebfa03c..c3bd86b 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -208,14 +208,15 @@ class System(item.Item): } def printable(self): - buf = _("system : %s\n") % self.name - buf = buf + _("profile : %s\n") % self.profile - buf = buf + _("kernel options : %s\n") % self.kernel_options - buf = buf + _("ks metadata : %s\n") % self.ks_meta - buf = buf + _("ip address : %s\n") % self.get_ip_address() - buf = buf + _("mac address : %s\n") % self.get_mac_address() - buf = buf + _("pxe info set? : %s\n") % self.is_pxe_supported() - buf = buf + _("pxe id : %s\n") % self.get_system_identifier() - buf = buf + _("hostname : %s\n") % self.hostname + buf = _("system : %s\n") % self.name + buf = buf + _("profile : %s\n") % self.profile + buf = buf + _("kernel options : %s\n") % self.kernel_options + buf = buf + _("ks metadata : %s\n") % self.ks_meta + buf = buf + _("ip address : %s\n") % self.get_ip_address() + buf = buf + _("mac address : %s\n") % self.get_mac_address() + buf = buf + _("hostname : %s\n") % self.hostname + buf = buf + _("pxe info set? : %s\n") % self.is_pxe_supported() + buf = buf + _("config id : %s\n") % utils.get_config_filename(self) + buf = buf + _("netboot enabled? : %s\n") % self.netboot_enabled return buf |