From 0e8adb75c6d82a83d371745c85f219b8412ceb88 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 9 Oct 2007 19:20:43 -0400 Subject: In templating, show the 1st mac as "$mac_address_intf1" not "$mac_addressintf1". And so on for other vars and other interfaces. --- cobbler/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobbler/utils.py b/cobbler/utils.py index b84140c..48e79d8 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -302,7 +302,7 @@ def blender(remove_hashes, root_obj): if root_obj.COLLECTION_TYPE == "system": for (name,interface) in root_obj.interfaces.iteritems(): for key in interface.keys(): - results["%s%s" % (key,name)] = interface[key] + results["%s_%s" % (key,name)] = interface[key] # just to keep templates backwards compatibile if name == "0": results[key] = interface[key] -- cgit