Change Details

This patch adds two new options that can be specified in mergemaster.rc. IGNORE_TYPE_FILES will skip the type check for these files completely, while ALLOW_SYMLINK specifies that the listed files are allowed to be symlinks as long as they point to a file of the correct type and do not escape outside of DESTDIR if specified.

This patch adds support for the new option ALLOW_SYMLINK which can be used to specify which files are allowed to have a file type mismatch if the mismatch is caused by a symbolic link to the correct type. If the installation target is changed via DESTDIR, the symlink is not allowed to escape from it. ALLOW_SYMLINK is hardcoded to always allow /boot to mismatch, since a bsdinstall configurations exist that create /boot as symlink to an unencrypted boot pool. In this case ignoring the mismatch during mergemaster causes mergemaster to also ignore - and thus not update - any files below /boot. It is hardcoded to avoid introducing a mergemaster configuration file newly into the base install.

This patch adds two new options that can be specified in mergemaster.rc.support for the new option ALLOW_SYMLINK which can be used to specify which files are allowed to have a file type mismatch if the mismatch is caused by a symbolic link to the correct type. If the installation target is changed via DESTDIR, the symlink is not allowed to escape from it. ALLOW_SYMLINK is hardcoded to always allow /boot to mismatch, IGNORE_TYPE_FILES will skip the type check for these files completely,since a bsdinstall configurations exist that create /boot as symlink to an unencrypted boot pool. while ALLOW_SYMLINK specifies that the listed files are allowed to be symlinks as long as they point to a file of the correct type and do not escape outside of DESTDIR if specifiedIn this case ignoring the mismatch during mergemaster causes mergemaster to also ignore - and thus not update - any files below /boot. It is hardcoded to avoid introducing a mergemaster configuration file newly into the base install.