Good afternoon!

Could I please get a fast code review for

http://monaco.sfbay.sun.com/detail.jsf?cr=7066137
after 7060689 is pushed, AI creates an empty <destination/> entry which crashes zones installs

Mike Gerdts tested this change out on his system and he was able to get past the part of transfer that tries to parse the DOC.

It's a small, 2 line fix so it's included here:


diff -r b98072ff34f8 usr/src/cmd/auto-install/auto_install.py
--- a/usr/src/cmd/auto-install/auto_install.py Tue Jul 12 11:36:32 2011 -0700 +++ b/usr/src/cmd/auto-install/auto_install.py Tue Jul 12 13:15:09 2011 -0600
@@ -985,6 +985,7 @@
                     image = dst.get_first_child(class_type=Image)
                     if image is None:
image = Image(self.installed_root_dir, image_action)
+                        dst.insert_children(image)
                     else:
                         if image.img_root is not None:
                             self.logger.error(
@@ -995,7 +996,6 @@

                         image.img_root = self.installed_root_dir
                         image.action = image_action
-                        dst.insert_children(image)

                     # Delete any existing children of ImType
                     image.delete_children(class_type=ImType)



Thanks!

-Drew
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss

Reply via email to