java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 15
++++------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 2941f0602801239ae7261a6e1b857516bd5b6eb3
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 9a56201..f6391d2 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,8 +1467,8 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
private ValidatorError validateNetworkInterface() {
- if (!StringUtils.isEmpty(networkInterface) &&
- !(isDhcp && "link".equals(networkInterface)))
{
+
+ if (!LINK_NETWORK_TYPE.equals(networkInterface)) {
boolean nicAvailable = false;
for (NetworkInterface nic : server.getNetworkInterfaces()) {
if (networkInterface.equals(nic.getName())) {
Show replies by thread