java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 9 +++++++++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 4f0f5c6c059ff85c6d032766966a52288f59c7e1
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 18:01:21 2010 -0500
fixing issue that kept spacewalk from working with the newest cobbler
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index ea255b8..75288b0 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -390,6 +390,15 @@ public class ConfigDefaults {
}
/**
+ * get the text to print at the top of a kickstart template
+ * @return the header
+ */
+ public String getKickstartTemplateHeader() {
+ return Config.get().getString("kickstart.header", "#errorCatcher
ListErrors");
+ }
+
+
+ /**
* Returns the default network interface for a kickstart profile
* @return the network interface
*/
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 66e5921..b1ffa27 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -254,7 +254,7 @@ public class KickstartFormatter {
*/
private StringBuffer getHeader() {
StringBuffer header = new StringBuffer();
- header.append("#errorCatcher Echo").append(NEWLINE);
+
header.append(ConfigDefaults.get().getKickstartTemplateHeader()).append(NEWLINE);
header.append(HEADER);
header.append(COMMENT);
header.append("# Profile Label : " + this.ksdata.getLabel() +
NEWLINE);
Show replies by date