java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java | 18 ++++++++++ java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java | 3 + 2 files changed, 21 insertions(+)
New commits: commit 43100e9cd4b055b1421c3e9614455586763fab08 Author: Uwe Gansert ug@suse.de Date: Wed Oct 12 17:08:27 2011 +0200
Set breed in cobbler correctly
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java index bdc0c35..095faf6 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java @@ -32,6 +32,7 @@ public class KickstartInstallType extends BaseDomainHelper { public static final String FEDORA = "fedora"; public static final String GENERIC = "generic"; public static final String SUSE = "suse"; + public static final String REDHAT = "redhat";
private Long id; private String label; @@ -166,4 +167,21 @@ public class KickstartInstallType extends BaseDomainHelper { return new HashCodeBuilder().append(getLabel()).toHashCode(); }
+ /** + * get the string cobbler understands as breed + * @return cobbler breed compatible string + */ + public String getCobblerBreed() { + String breed = REDHAT; + + if (getLabel().equals("generic_rpm")) { + breed = GENERIC; + } + else if (getLabel().equals(SUSE)) { + breed = SUSE; + } + + return breed; + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java index 77ffa19..f495f2d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java @@ -84,12 +84,14 @@ public class CobblerDistroCommand extends CobblerCommand { if (xen == null) { xen = Distro.create(con, tree.getCobblerXenDistroName(), tree.getKernelXenPath(), tree.getInitrdXenPath(), ksmeta); + xen.setBreed(tree.getInstallType().getCobblerBreed()); xen.save(); tree.setCobblerXenId(xen.getId()); } else { xen.setKernel(tree.getKernelXenPath()); xen.setInitrd(tree.getInitrdXenPath()); + xen.setBreed(tree.getInstallType().getCobblerBreed()); xen.setKsMeta(ksmeta); xen.save(); } @@ -106,6 +108,7 @@ public class CobblerDistroCommand extends CobblerCommand { if (nonXen != null) { nonXen.setInitrd(tree.getInitrdPath()); nonXen.setKernel(tree.getKernelPath()); + nonXen.setBreed(tree.getInstallType().getCobblerBreed()); nonXen.setKsMeta(ksmeta); nonXen.save(); }
spacewalk-commits@lists.fedorahosted.org