java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 5 +++++
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 3801b0bfd244ac3170f1a841303c5b3c717dc82a
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Aug 19 19:20:30 2009 -0400
518342 - adding workaround for RHEL5u4 bug failing to register when dbus and hal are
not running
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 b19e112..dc94a64 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -682,6 +682,11 @@ public class KickstartFormatter {
retval.append(KSTREE);
retval.append(NEWLINE);
+ //RHEL 5u4 hack for bz 495680
+ if (ksdata.isRhel5()) {
+ retval.append("/etc/init.d/messagebus restart" + NEWLINE);
+ retval.append("/etc/init.d/haldaemon restart" + NEWLINE);
+ }
retval.append("# begin cobbler snippet" + NEWLINE);
retval.append("$SNIPPET('redhat_register')" + NEWLINE);
retval.append("# end cobbler snippet" + NEWLINE);
commit 90eac7ecae4919d091afb6c6434e8602de525890
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 20 13:08:40 2009 -0400
new way of waiting on process for RepoSync task. Hopefully this does not bail out
after a long time
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 57b9f8b..4d32ff8 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -81,7 +81,11 @@ public class RepoSyncTask implements Job {
Process p = Runtime.getRuntime().exec(
getSyncCommand(src).toArray(new String[0]));
src.setLastSynced(new Date());
- p.waitFor();
+ int chr = p.getInputStream().read();
+ while (chr != -1) {
+ Thread.sleep(10000);
+ chr = p.getInputStream().read();
+ }
}
catch (IOException e) {
Show replies by date