java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 10
++++------
java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java | 8
+++++---
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 311a6ccb44710cf1d8ef1c57d470634a9010bee3
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 4 18:56:28 2009 -0400
514291 - Fix for KS by IP
This fix in addition to the previous commit related to this bug
will make sure systems that were not kickstarted successfully by SSM
KS by IP will correctly get reported as failed.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index c7e74f0..075d4bd 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -1390,17 +1390,15 @@ public class KickstartScheduleCommand extends BaseSystemOperation
{
* @param networkInterfaceIn The staticDevice to set.
*/
public void setNetworkDevice(String networkType, String networkInterfaceIn) {
- isDhcp = DHCP_NETWORK_TYPE.equals(networkType) ||
- StringUtils.isBlank(networkType) ||
- LINK_NETWORK_TYPE.equals(networkType);
- if (StringUtils.isBlank(networkType) ||
- networkType.equals(LINK_NETWORK_TYPE)) {
+ if (StringUtils.isBlank(networkType) ||
+ LINK_NETWORK_TYPE.equals(networkType)) {
+ isDhcp = true;
networkInterface = LINK_NETWORK_TYPE;
}
else {
+ isDhcp = DHCP_NETWORK_TYPE.equals(networkType);
networkInterface = networkInterfaceIn;
}
-
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
index 90e4a4a..9de43bb 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
@@ -180,7 +180,7 @@ public class SSMScheduleCommand {
//an IP Range was not found for the ip address of this system
// and no org default was set. In the future maybe we should handle this
// but for now, we'll just move on
- return null;
+ return new ValidatorError("no.kickstart.profiles");
}
KickstartScheduleCommand com;
@@ -218,8 +218,10 @@ public class SSMScheduleCommand {
ValidatorError error = com.store();
-
- this.scheduledActions.add(com.getScheduledAction());
+ if (error == null) {
+ this.scheduledActions.add(com.getScheduledAction());
+ }
+
return error;
}
Show replies by date