summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--cobbler/pxegen.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index f67873ee..5f9e0fc2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ Patches and other contributions from:
Bryan Mason <bjmason@redhat.com>
Mike McCune <mmccune@redhat.com>
Jim Meyering <jim@meyering.net>
+ Jeroen van Meeuwen <kanarip@kanarip.com>
Sean Millichamp <sean@bruenor.org>
Perry Myers <pmyers@redhat.com>
Jack Neely <jjneely@ncsu.edu>
diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py
index 4ea9dee4..f4f21526 100644
--- a/cobbler/pxegen.py
+++ b/cobbler/pxegen.py
@@ -471,9 +471,10 @@ class PXEGen:
# store variables for templating
metadata["menu_label"] = ""
- if profile and not arch == "ia64" and system is None:
- metadata["menu_label"] = "MENU LABEL %s" % profile.name
- metadata["profile_name"] = profile.name
+ if profile:
+ if not arch in [ "ia64", "ppc", "ppc64", "s390x" ]:
+ metadata["menu_label"] = "MENU LABEL %s" % profile.name
+ metadata["profile_name"] = profile.name
elif image:
metadata["menu_label"] = "MENU LABEL %s" % image.name
metadata["profile_name"] = image.name