Page MenuHomeFreeBSD

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

Authored by brd on May 16 2019, 6:11 PM.

Diff Detail

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

Event Timeline

brd created this revision.May 16 2019, 6:11 PM
manu accepted this revision.May 16 2019, 6:27 PM
This revision is now accepted and ready to land.May 16 2019, 6:27 PM
will accepted this revision.May 16 2019, 6:42 PM
brd updated this revision to Diff 57459.May 16 2019, 7:24 PM

Chase etcupdate build as well

This revision now requires review to proceed.May 16 2019, 7:24 PM
manu accepted this revision.May 16 2019, 7:46 PM
This revision is now accepted and ready to land.May 16 2019, 7:46 PM
allanjude requested changes to this revision.May 16 2019, 8:12 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
brd updated this revision to Diff 57462.May 16 2019, 9:29 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.