William Schumann wrote: > Jean, > I pushed a different fix and had to resolve some conflicts in > auto_install.[ch] > I also made #define statements in auto_parse.c for the strings for the > IPS RNG elements. > Resubmitted webrev.
Looks good. Jean > > Also, from my previous message: > Jean McCormack wrote: >> General comment: I think there's another bug being fixed in this >> codereview? > I had included some fairly innocuous lines from other outstanding bug > fixes and have removed them. > Otherwise, there is a cleanup of code that deallocates heap space in > auto_parse.c. >> >> auto_parse.c: >> lines 524,541,558,575 need to reflect what the functions really do. > done >> >> auto_install.c: >> lines 57 & 58: How are these related to the bugs? > They are not. Removed. >> >> lines 497 & 507: I think there's a memory line of api here. > Added free(api) at error_ret: >> >> lines 753-4 & 758-763: The code would be clearer if these were moved >> up before the read of the manifest for the mirror. > did last part of this one >> >> lines 755 & 769: If the above mentioned code is moved, these two ifs >> could be combined into one. > I wrote it this way to separate the logging from the building of > attribute lists. Easier to follow logging indentations, and easier to > read bulky attribute definitions as a contiguous block. >> >> line 807: I think there's a TM define for -m. Might be nice to use >> that in case they change it. (TM_SET_MIRROR???) > TM_IPS_SET_MIRROR >> >> line 919: ditto > dittoed > > William >> >> Jean >> >> >> >> William Schumann wrote: >>> 6610 AI does not recognize additional IPS repository >>> 6435 AI should support installation from IPS content mirror >>> >>> http://cr.opensolaris.org/~wmsch/bug-6610/ >>> http://defect.opensolaris.org/bz/show_bug.cgi?id=6610 >>> http://defect.opensolaris.org/bz/show_bug.cgi?id=6435 >>> >>> Since these are already coded in TM and are basically a list of IPS >>> initialization actions for tm_perform_transfer(), fixes are combined. >>> >>> Made variable list of actions to Transfer Module, which already >>> supports additional authorities and mirrors >>> >>> Commands are launched from TM: >>> pkg image-create ... >>> add alternate authority: >>> pkg -R /a set-authority -O <url> --no-refresh <authority> >>> specify mirror for authority: >>> pkg -R /a set-authority -m <mirror URL> --no-refresh <authority> >>> >>> Tested: >>> simple primary authority >>> primary authority with mirror >>> primary authority with alternate authority >>> primary authority with mirror and alternate authority >>> primary authority with mirror and alternate authority with alternate >>> mirror >>> primary authority and alternate authority with alternate mirror >>> >>> pkg -R /a authority -a >>> reflected the changes, except that it doesn't seem to display the >>> mirror. Confirmed authority mirrors were assigned by deleting them >>> with pkg set-authority -M <mirror URL> <authority> >>> _______________________________________________ >>> caiman-discuss mailing list >>> caiman-discuss at opensolaris.org >>> http://mail.opensolaris.org/mailman/listinfo/caiman-discuss >> >