LGTM
On 18/04/2012 19:09, Drew Fisher wrote: > Good afternoon! > > Could I please get a quick code review for the following CR: > > 7162496 <http://monaco.us.oracle.com/detail.jsf?cr=7162496> auto-install > fails in target-discovery on live system with S11u1_14 > > The diffs are very simple so I'll just in-line them: > > diff -r 851d069ece17 -r 3572894d6192 usr/src/lib/install_target/discovery.py > --- a/usr/src/lib/install_target/discovery.py Wed Apr 18 10:52:00 2012 -0700 > +++ b/usr/src/lib/install_target/discovery.py Wed Apr 18 12:05:21 2012 -0600 > @@ -718,14 +718,13 @@ > # to find all the drives on the system, first start with the > # controllers > for controller in diskmgt.descriptors_by_type(const.CONTROLLER): > - # trap on the "/pseudo" controller (zvol swap and dump) > - if controller.name == "/pseudo" and add_physical: > - self.discover_pseudo(controller) > - > # skip USB floppy controllers > if controller.floppy_controller: > continue > > + # trap on the "/pseudo" controller (zvol swap and dump) > + if controller.name == "/pseudo" and add_physical: > + self.discover_pseudo(controller) > else: > # extract every drive on the given controller > for drive in controller.drives: > > > We need to move the check for USB floppy controllers above the check for > controller.name == "/pseudo" or we end up trying to discover the 'dump' drive. > > All unittests run clean and the system Harold is using where this problem > manifested now runs target discovery cleanly. > > Thanks! > > -Drew > > > > _______________________________________________ > caiman-discuss mailing list > [email protected] > http://mail.opensolaris.org/mailman/listinfo/caiman-discuss _______________________________________________ caiman-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
