On Wed, Jun 30, 2010 at 06:25:58AM -0600, Jerry Jelinek wrote: > On 06/30/10 04:36, Gary Pennington wrote: > >On Tue, Jun 29, 2010 at 06:21:22PM -0700, Edward Pilatowicz wrote: > >>On Tue, Jun 29, 2010 at 10:21:43AM -0700, Gary Pennington wrote: > >>>Hi, > >>> > >>>Small/Quick code review please. Anyone from the zones team who knows the > >>>context of http://sac.sfbay.sun.com/PSARC/2010/156/mail would be ideal. > >>> > >>>webrev: > >>> > >>>http://cr.opensolaris.org/~garypen/gate/ > >>> > >>>workspace: > >>> > >>>/builds/garypen/HG/6939693-pkg/gate > >>> > >> > >>hey gary, > >> > >>so, support.c doesn't do anything other than check for inherit-pkg-dir > >>entries. hence it seems best to just remove the whole program rather > >>than leave it to do nothing. :) > >> > > > >Hi Ed, > > > >I had previously looked into the usage of this bit of code and it seems > >to be used as part of the "under-pinning" of the zones infrastructure: > > > >e.g: > > > >./sn1/zone/config.xml: <verify_cfg>/usr/lib/brand/ipkg/support > >verify</verify_c > >fg> > >./ipkg/zone/config.xml: <verify_cfg>/usr/lib/brand/ipkg/support > >verify</verify_c > >fg> > >./labeled/zone/config.xml: <verify_cfg>/usr/lib/brand/ipkg/support > >verify</ > >verify_cfg> > >bash-4.0$ > > > >This is a bit of the code that I'm unfamiliar with and, since I'm making > >extensive changes anyway, I decided to be conservative and keep this in > >place. > > > >I'd rather treat removal of it as a separate fix, since the change I have > >in 6939693 are tested and approved to integrate and it's important to get > >these changes back. > > > >If you do think we should remove the code, then I'll file another bug to > >cover that change and do that separately. > > Gary, > > Its not really "under-pinning", its just the brand hook for extra > zonecfg verification for these specific brands. Since the > only verification we were doing was around the presence of > "inherit-pkg-dir" its easier to remove all of this code altogether > than to edit the existing hook down to a no-op. If you want to > remove the code in a different putback, then you could just > edit the config.xml files for your initial putback so that the > verify_cfg hook is empty. This would keep those brands > working for now. > > Let me know if you have any questions on this. > > Thanks, > Jerry
Hi Jerry, I putback the change for 6939693. I'll putback the change I have for the pkg gate, since I need to do something quickly to keep them in sync. I'll also send out the Heads Up message. I'll raise a new CR to make the changes to ON and packaging that remove the file and the entries in the config.xml files. Gary _______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
