Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 May 2019 04:33:52 -0700
From:      David Wolfskill <david@catwhisker.org>
To:        current@freebsd.org
Subject:   r347638 breaks mergemaster
Message-ID:  <20190516113352.GT1330@albert.catwhisker.org>

next in thread | raw e-mail | index | archive | help

--o0Vsbun0CJ9H5mm4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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

src/UPDATING (still) cites:

=2E..
        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=3DYOUR_KERNEL_HERE
        make installkernel KERNCONF=3DYOUR_KERNEL_HERE
                                                        [1]
        <reboot in single user>                         [3]
        mergemaster -Fp                                 [5]
        make installworld
        mergemaster -Fi                                 [4]
        make delete-old                                 [6]
        <reboot>
=2E...

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
|=20
| cp: /usr/src/etc/master.passwd: No such file or directory
|=20
|   *** FATAL ERROR: Cannot copy files to the temproot environment

I don't know if etcupdate is similarly affected. =20

Peace,
david
--=20
David H. Wolfskill				david@catwhisker.org
Since the Senate is controlled by Trump's lap-dogs, impeachment now is fool=
ish.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.

--o0Vsbun0CJ9H5mm4
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAlzdSqBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy
OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2
Pclr4gf/YWZ50+N0njV8LX82xxCST/6rnJbjWgFdfhxABVbdJKzLDm2fHDQYO/xS
chTtwtiDzFjq7PJV+lAgqOB0liH/9lXNUO1ToD9RAz6sQZfoEy1GHPcECkjTogn2
h5Zoo0s2DjaXc61uZCKx1d6SwQDUs+LpRqelDn75Cw3DhnBMd6IypR5Fow0vgRHl
4WuxDATvND61hTfk9mRaSDP8OSxmuzW7PkV2uS68K3prvnk32vNRpzzHn/D0kEP/
FYHwmKlww63HakLREEYhe11VF7P4zMdXDsV8mLaesgjNzPn3eNTb6YkhM43V+kDN
9er7tecszhPvYrr2PbGLUwWoIk1q3Q==
=POiW
-----END PGP SIGNATURE-----

--o0Vsbun0CJ9H5mm4--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190516113352.GT1330>