Page MenuHomeFreeBSD

Fix mergemaster after r347638 and the master.passwd / group move
ClosedPublic

Authored by brd on May 16 2019, 6:11 PM.
Tags
None
Referenced Files
F105728099: D20279.diff
Thu, Dec 19, 6:59 PM
F105715878: D20279.diff
Thu, Dec 19, 3:15 PM
F105711613: D20279.id57464.diff
Thu, Dec 19, 1:55 PM
Unknown Object (File)
Tue, Dec 10, 10:10 PM
Unknown Object (File)
Mon, Dec 9, 6:33 PM
Unknown Object (File)
Mon, Nov 25, 3:51 AM
Unknown Object (File)
Thu, Nov 21, 3:04 AM
Unknown Object (File)
Wed, Nov 20, 1:31 AM
Subscribers

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 24262
Build 23093: arc lint + arc unit

Event Timeline

This revision is now accepted and ready to land.May 16 2019, 6:27 PM

Chase etcupdate build as well

This revision now requires review to proceed.May 16 2019, 7:24 PM
This revision is now accepted and ready to land.May 16 2019, 7:46 PM
allanjude added a subscriber: allanjude.
allanjude added inline comments.
usr.sbin/mergemaster/mergemaster.sh
673–674

We need to check if this new path exists, and fail back to the old path, so that this can be used in say 12.1 for both upgrading to 12.2 or 13.0.

We'll then also need to MFC it to all supported branches.

This revision now requires changes to proceed.May 16 2019, 8:12 PM

Add logic for etcupdate and mergemaster to handle the old and new location.

This should be MFCed to stable/12 and stable/11.

This revision was not accepted when it landed; it landed in state Needs Review.May 16 2019, 9:50 PM
This revision was automatically updated to reflect the committed changes.