Hi Keith, I've updated the webrev at http://cr.opensolaris.org/~evanl/364,7880v3/ with your suggestion to use the with command. I think that has simplified and cleaned up the code a bit. Can take a quick look and let me know what you think?
Thanks! -evan Evan Layton wrote: > Due to comments recived from David Comay I've changed the fix for bug > 364 slightly. This changes the fix so that the user entry we're adding > doesn't follow the +auto_home entry but comes before it so the user will > always get the local home directory and not something pulled out of an > automounter map on the network. > > These updates are reflected in the following incremental webrev: > http://cr.opensolaris.org/~evanl/364,7880v3/ > > Thanks! > -evan > > Evan Layton wrote: >> I need to get a quick re-review of the changes for the following bugs: >> http://defect.opensolaris.org/bz/show_bug.cgi?id=364 >> http://defect.opensolaris.org/bz/show_bug.cgi?id=7880 >> http://defect.opensolaris.org/bz/show_bug.cgi?id=11436 >> >> Most of these changes have already been reviewed however some changes >> were necessary after the python 2.6 changes where pushed and due to >> the backout of bug 12224. >> >> The changes that really need to be looked at are in the following files >> usr/src/lib/libict_pymod/ict.py >> usr/src/lib/libbe/be_utils.c >> >> Everything else has already been reviewed however due to the python >> 2.6 merge I don't have access to a incremental webrev. The webrev with >> all of the changes is available at: >> http://cr.opensolaris.org/~evanl/364,7880v2 >> >> For convenience I've included the changes related to the backout of >> 12224. >> These changes are limited to be_create_menu() in be_utils.c. >> >> >> *** 3474,3502 **** >> >> /* >> * Now we need to add all the BE's back into the the file. >> */ >> if (_be_list(NULL, &be_nodes) == BE_SUCCESS) { >> - int count = 0; >> while (be_nodes != NULL) { >> (void) be_append_menu(be_nodes->be_node_name, >> be_nodes->be_rpool, NULL, NULL, NULL); >> ! if (be_nodes->be_active_on_boot) >> ! active_be = count; >> ! count++; >> be_nodes = be_nodes->be_next_node; >> } >> } >> be_free_list(be_nodes); >> >> /* >> * Check to see if this system supports grub >> */ >> if (be_has_grub()) { >> ! snprintf(add_default_cmd, sizeof (add_default_cmd), >> ! "%s set-menu default=%d", BOOTADM, active_be); >> ! err = system(add_default_cmd); >> if (err != 0) >> return (err); >> } >> *menu_fp = fopen(menu_file, mode); >> err = errno; >> --- 3505,3532 ---- >> >> /* >> * Now we need to add all the BE's back into the the file. >> */ >> if (_be_list(NULL, &be_nodes) == BE_SUCCESS) { >> while (be_nodes != NULL) { >> (void) be_append_menu(be_nodes->be_node_name, >> be_nodes->be_rpool, NULL, NULL, NULL); >> ! if (be_nodes->be_active_on_boot) { >> ! be_rpool = strdup(be_nodes->be_rpool); >> ! be_name = >> strdup(be_nodes->be_node_name); >> ! } >> ! >> be_nodes = be_nodes->be_next_node; >> } >> } >> be_free_list(be_nodes); >> >> /* >> * Check to see if this system supports grub >> */ >> if (be_has_grub()) { >> ! err = be_change_grub_default(be_name, be_rpool); >> if (err != 0) >> return (err); >> } >> *menu_fp = fopen(menu_file, mode); >> err = errno; >> >> >> These fixes are still in the process of being re-tested on both a live >> system and from install images with these bits but so far the testing >> has found no issues. >> >> Thanks! >> -evan >> _______________________________________________ >> caiman-discuss mailing list >> caiman-discuss at opensolaris.org >> http://mail.opensolaris.org/mailman/listinfo/caiman-discuss >
