Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure Darwin hosts are always mac_os_x #1470

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Make sure Darwin hosts are always mac_os_x #1470

merged 1 commit into from
Jun 23, 2020

Conversation

tas50
Copy link
Contributor

@tas50 tas50 commented Jun 23, 2020

mac_os_x_server isn't a thing anymore and no third party darwin based
operating systems ever took off. Fix this detectio and speed things up
a tiny bit by assuming darwin == mac_os_x just like we already do with
the platform_family

Signed-off-by: Tim Smith tsmith@chef.io

mac_os_x_server isn't a thing anymore and no third party darwin based
operating systems ever took off. Fix this detectio and speed things up
a tiny bit by assuming darwin == mac_os_x just like we already do with
the platform_family

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50 tas50 requested review from a team as code owners June 23, 2020 04:45
@tas50
Copy link
Contributor Author

tas50 commented Jun 23, 2020

@chilcote does this look like a valid way to resolve #1469. Correct me if I'm wrong, but there isn't a supported MacOS X Server anymore so we shouldn't have to worry about that distinction. I think that's the only historical reason we had this other than some 2010-era hope that someone might come out with a Darwin mac clone OS.

@chilcote
Copy link

chilcote commented Jun 23, 2020

Yep, macOS Server is just an app now. This should work, thanks! (will this be back-ported to chef15?)

The change you made to platform.rb is exactly what I did locally to test and that solved it.

@tas50
Copy link
Contributor Author

tas50 commented Jun 23, 2020

Yeah I'll kick this back to Ohai 15 and make sure we get a chef release going

@erikng
Copy link
Contributor

erikng commented Jun 23, 2020

When this lands, pretty please make a new chef installer that supports 10.16.

Maybe another chef 16.2 build?

@tas50
Copy link
Contributor Author

tas50 commented Jun 23, 2020

We need 10.16 builders in Mac Stadium first. That's not going to happen overnight, but our releng folks know it's a request.

@tas50 tas50 merged commit 5036b07 into master Jun 23, 2020
@chef-expeditor chef-expeditor bot deleted the big_sur branch June 23, 2020 05:24
@erikng
Copy link
Contributor

erikng commented Jun 23, 2020

@tas50 honestly that shouldn't matter too much. Build one for 10.15 and we can use that for now :).

We don't ship any of the "OS specific" versions of chef anyway.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants