r347638 breaks mergemaster

[David Wolfskill]

Today's daily update of head is from r347606 to r347682.

src/UPDATING (still) cites:

...
        To rebuild everything and install it on the current system.
        -----------------------------------------------------------
        # Note: sometimes if you are running current you gotta do more than
        # is listed here if you are upgrading from a really old current.

        <make sure you have good level 0 dumps>
        make buildworld
        make buildkernel KERNCONF=YOUR_KERNEL_HERE
        make installkernel KERNCONF=YOUR_KERNEL_HERE
                                                        [1]
        <reboot in single user>                         [3]
        mergemaster -Fp                                 [5]
        make installworld
        mergemaster -Fi                                 [4]
        make delete-old                                 [6]
        <reboot>
....

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.  

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Since the Senate is controlled by Trump's lap-dogs, impeachment now is foolish.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20190516/1f116855/attachment.sig>