not overwriting files in /usr/share/skel

[Miroslav Lachman]

Files in /usr/share/skel are used as example . (dot) files for new 
accounts, when new user is added by adduser command.
We have some local modifications in those files, like another umask and 
so on.
The modification is persistent accross upgrades if system is upgraded by 
freebsd-update, as we have the directory listed in UpdateIfUnmodified 
and MergeChanges.

But on some machines, we can't use freebsd-update (in jails, or those 
running STABLE instead of RELEASE).

The files are overwritten on each installworld.

Is there any option to not overwrite files in /usr/share/skel or 
install/upgrade them with mergemaster instead?
Or should we use some other directory and use adduser.conf instead?

Miroslav Lachman

PS: I am CCing you Doug, because I think you are the most competent 
person in this area