Some image-object fixes

3 files changed, 7 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6b7dea1f..2048fc78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Cobbler CHANGELOG
 
-- TBD 2009 - for 2.0 release
+- Sep 18 2009 - 2.0.1
+- (BUGF) Fixes for image based CLI usage and object validation
+
+- Sep 17 2009 - for 2.0 release
 - Development release start
 - (FEAT) add two new default flags to yum reposync (-m and -d) for grabbing comps automatically and also deleting duplicate RPMs
 - (BUGF) validate gateway input against python-netaddr
diff --git a/cobbler/cli.py b/cobbler/cli.py
index 3fb1ec81..7570c7a3 100755
--- a/cobbler/cli.py
+++ b/cobbler/cli.py
@@ -231,7 +231,7 @@ class BootCLI:
         elif object_type == "repo":
             return item_repo.FIELDS
         elif object_type == "image":
-            return item_repo.FIELDS
+            return item_image.FIELDS
 
     def object_command(self, object_type, object_action):
         """
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index 3061f20b..9452f7ca 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -524,6 +524,7 @@ class System(item.Item):
         if self.name is None or self.name == "":
             raise CX("name is required")
         if self.profile is None or self.profile == "":
-            raise CX("profile is required")
+            if self.image is None or self.image == "":
+                raise CX("profile or image is required")