This seems to work for me, I don't know if you have any other specific testing etc.
For the most part, I looked at anywhere you had a special cast for v3.16 or edge, and did what seemed right.
One bit I wasn't sure of, was that you only seem to enable the ptp time sync bits for cloud-init when using edge and --experimental - I've left this alone and only on edge for now as it seemed quite broken otherwise that (attempts at) fixing it should be a whole separate PR on it's own.
This seems to work for me, I don't know if you have any other specific testing etc.
For the most part, I looked at anywhere you had a special cast for
v3.16
oredge
, and did what seemed right.One bit I wasn't sure of, was that you only seem to enable the
ptp
time sync bits for cloud-init when usingedge
and--experimental
- I've left this alone and only on edge for now as it seemed quite broken otherwise that (attempts at) fixing it should be a whole separate PR on it's own.