On 10/22/2011 06:02, Jeremy Chadwick wrote: > 3. Hand-hack /etc/network.subr to address this, which you will lose > every time you run mergemaster
I'm not sure why you'd say that. By design mergemaster checks the $FreeBSD Id string in the installed file and if it's the same as the one in the temproot then it deletes the temproot version and moves on. That behavior was primarily designed to accommodate configuration files, but it works just as well for everything else mergemaster deals with. hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"