r347638 breaks mergemaster

[Mateusz Piotrowski]

On Thu, 16 May 2019 at 13:34, David Wolfskill <david at catwhisker.org> wrote:

> ...
> But rr347638 moved master.passwd from src/etc to lib/libc/gen, so
> mergemaster ... isn't happy:
>
> | *** Creating the temporary root environment in /var/tmp/temproot
> |  *** /var/tmp/temproot ready for use
> |  *** Creating and populating directory structure in /var/tmp/temproot
> |
> | cp: /usr/src/etc/master.passwd: No such file or directory
> |
> |   *** FATAL ERROR: Cannot copy files to the temproot environment
>
> I don't know if etcupdate is similarly affected.
>

It is. I got the same error message from etcupdate.