java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 8 ++------ java/conf/cobbler/snippets/default_motd | 2 ++ java/spacewalk-java.spec | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit f47ed24770fe7e2d8dc5fd3393b6c7faddc269c9 Author: Mario Schugowski mario@mediatronix.de Date: Thu Mar 3 10:46:25 2011 +0100
678519 - moving MOTD into a separate kickstart snippent
drawback: /etc/motd doesn't contain product name any more
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 b261c92..0aa0f75 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -63,6 +63,7 @@ public class KickstartFormatter { private static final String POST_DELETION_SNIPPET = "spacewalk/post_delete_system"; private static final String KEEP_SYSTEM_ID_SNIPPET = "spacewalk/keep_system_id"; + private static final String DEFAULT_MOTD = "spacewalk/default_motd";
private static final String RAW_START = "#raw"; private static final String RAW_END = "#end raw"; @@ -79,11 +80,6 @@ public class KickstartFormatter { Config.get().getString("web.product_name") + " Config Management" + NEWLINE; private static final String COMMENT = "#" + NEWLINE; - private static final String MOTD_FOOTER = "# MOTD" + NEWLINE + "echo >> /etc/motd" + - NEWLINE + "echo "" + Config.get().getString("web.product_name") + - " kickstart on \$(date +'%Y-%m-%d')" >> /etc/motd" + - NEWLINE + "echo >> /etc/motd" + NEWLINE + NEWLINE + - "# end of generated kickstart file"; private static final String BEGINRHN = "%post --logfile " + "/root/ks-rhn-post.log" + NEWLINE + "# --Begin " + Config.get().getString("web.product_name") + @@ -266,7 +262,6 @@ public class KickstartFormatter { buf.append(NEWLINE); addCobblerSnippet(buf, "post_install_kernel_options"); addCobblerSnippet(buf, "koan_environment"); - buf.append(MOTD_FOOTER); buf.append(NEWLINE); buf.append("$kickstart_done"); buf.append(NEWLINE); @@ -677,6 +672,7 @@ public class KickstartFormatter { retval.append("/etc/init.d/haldaemon restart" + NEWLINE); } retval.append("# begin cobbler snippet" + NEWLINE); + addCobblerSnippet(retval, DEFAULT_MOTD); addCobblerSnippet(retval, REDHAT_REGISTER_SNIPPET); retval.append("# end cobbler snippet" + NEWLINE);
diff --git a/java/conf/cobbler/snippets/default_motd b/java/conf/cobbler/snippets/default_motd new file mode 100644 index 0000000..4f2b77b --- /dev/null +++ b/java/conf/cobbler/snippets/default_motd @@ -0,0 +1,2 @@ +# set default MOTD +echo "Kickstarted on $(date +'%Y-%m-%d')" >> /etc/motd diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index b0cd73b..59477ac 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -345,6 +345,7 @@ install -m 755 scripts/taskomatic $RPM_BUILD_ROOT%{_initrddir} install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT%{_datadir}/rhn/classes/log4j.properties
+install -m 644 conf/cobbler/snippets/default_motd $RPM_BUILD_ROOT%{cobdirsnippets}/default_motd install -m 644 conf/cobbler/snippets/keep_system_id $RPM_BUILD_ROOT%{cobdirsnippets}/keep_system_id install -m 644 conf/cobbler/snippets/post_reactivation_key $RPM_BUILD_ROOT%{cobdirsnippets}/post_reactivation_key install -m 644 conf/cobbler/snippets/post_delete_system $RPM_BUILD_ROOT%{cobdirsnippets}/post_delete_system @@ -497,6 +498,7 @@ fi %dir %{cobprofdirup} %dir %{cobprofdirwiz} %dir %{cobdirsnippets} +%config %{cobdirsnippets}/default_motd %config %{cobdirsnippets}/keep_system_id %config %{cobdirsnippets}/post_reactivation_key %config %{cobdirsnippets}/post_delete_system