Mike Kupfer writes: > Overall it looks good. A couple things caught my eye: > > * common_files/i.devlinktab_sparc [...] > but you've taken out the rm of /tmp/d.$$. Should that "cp" be "mv"?
Good catch. I'll just put the "rm" back. > * common_files/i.etcsystem: > > Having i.etcsystem know /etc/system's most recent SCCS delta seems > awfully fragile. And even if it doesn't actually need to know the > exact revision string (which I'm not sure it does), the new code > implies that it does, which will be confusing. Maybe we should just > change the revision check to something like > > 193 if [ "$oldrev" != "$newrev" -o -z "$newrev" ] That doesn't quite fix the problem, unfortunately. If I do that, then every single upgrade will cause /etc/system.new to be created and a note to be added to the $CLEANUP_FILE. I'd like to avoid that. But you did cause me to think about this some more, and I've realized that my proposed "fix" doesn't do any better at crossing the transition, as I'll completely mishandle a system with a newly- installed SCCS-ID-less /etc/system file. I looked at $SRC/cmd/nsadmin/system, and we really haven't changed this file in decades, so it's time to ditch this logic. I'll simply remove all of it, so that if the file already exists, all we do is handle the normal eol removals, and not attempt to update the comments in place. They haven't changed since "This Used To Be My Playground" was a #1 hit, and we can probably discount the issue now. ;-} > * common_files/i.publickey > > Some comments for the nawk script would be helpful. Something like > > # From the source file, take everything before the "nobody" > # line. If there's no "nobody" line, take the entire thing. > # > # From the destination file, take everything after the initial > # comment block. Or, if there's a "netname" comment, take > # everything after that comment. Sure; will do. > A note motivating the "netname" test would be useful, too. Is it an > attempt to preserve user comments? Yes; exactly. New webrev to follow ... -- James Carlson, Solaris Networking <james.d.carlson at sun.com> Sun Microsystems / 35 Network Drive 71.232W Vox +1 781 442 2084 MS UBUR02-212 / Burlington MA 01803-2757 42.496N Fax +1 781 442 1677
