java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 13
++++------
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 -
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 15e3be8cc264f2ce9db9c87bc67640ad12bca900
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Aug 3 19:43:45 2009 -0400
514291 - Fix to properly schedule ssm ks over IP range
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 5217dcb..c7e74f0 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -934,9 +934,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
* @return extraOptions that will be appended to the Kickstart.
*/
public String getExtraOptions() {
- if (isCobblerOnly()) {
- return StringUtils.defaultString(kernelOptions);
- }
StringBuilder retval = new StringBuilder();
String kOptions = StringUtils.defaultString(kernelOptions);
/** Some examples:
@@ -1393,9 +1390,11 @@ public class KickstartScheduleCommand extends BaseSystemOperation
{
* @param networkInterfaceIn The staticDevice to set.
*/
public void setNetworkDevice(String networkType, String networkInterfaceIn) {
- isDhcp = networkType.equals(DHCP_NETWORK_TYPE) ||
- networkType.equals(LINK_NETWORK_TYPE);
- if (networkType.equals(LINK_NETWORK_TYPE)) {
+ isDhcp = DHCP_NETWORK_TYPE.equals(networkType) ||
+ StringUtils.isBlank(networkType) ||
+ LINK_NETWORK_TYPE.equals(networkType);
+ if (StringUtils.isBlank(networkType) ||
+ networkType.equals(LINK_NETWORK_TYPE)) {
networkInterface = LINK_NETWORK_TYPE;
}
else {
@@ -1468,7 +1467,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
private ValidatorError validateNetworkInterface() {
- if (!StringUtils.isEmpty(networkInterface)) {
+ if (!LINK_NETWORK_TYPE.equals(networkInterface)) {
boolean nicAvailable = false;
for (NetworkInterface nic : server.getNetworkInterfaces()) {
if (networkInterface.equals(nic.getName())) {
commit 13d0c9708e999800b7b10e89e2e0c76ec1bb4c5d
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Aug 3 19:38:42 2009 -0400
Validation errors on advanced ks page were ignored...
As in the Advanced KS Schedule page.. Fixed it..
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
index 7813b05..91099ea 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
@@ -22,7 +22,7 @@ function setStep(stepName) {
</head>
<body>
-
+<html:errors />
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<br />
Show replies by date