[Spacewalk-devel] [PATCH] Set breed in cobbler correctly

[Uwe Gansert]

Hi,

I noticed that the breed in cobbler is not set correctly when you edit/create 
a distro with the webfrontend.
I did a patch to fix that and attached it.


-- 
ciao, Uwe Gansert

SUSE LINUX Products GmbH, HRB 16746 (AG Nürnberg)
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer
Home: http://www.suse.de/~ug - Blog: http://suse.gansert.net

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..56063e7 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,20 @@ 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-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel